diff --git a/Data/Conduit/Combinators.hs b/Data/Conduit/Combinators.hs
--- a/Data/Conduit/Combinators.hs
+++ b/Data/Conduit/Combinators.hs
@@ -217,8 +217,15 @@
 import qualified System.Random.MWC as MWC
 import Data.Conduit.Combinators.Internal
 import qualified System.PosixCompat.Files as PosixC
+
+#ifndef WINDOWS
 import qualified System.Posix.Directory as Dir
+#endif
 
+#if MIN_VERSION_conduit(1,1,0)
+import qualified Data.Conduit.Filesystem as CF
+#endif
+
 -- END IMPORTS
 
 -- | Yield each of the values contained by the given @MonoFoldable@.
@@ -424,6 +431,10 @@
 --
 -- Since 1.0.0
 sourceDirectory :: MonadResource m => FilePath -> Producer m FilePath
+#if MIN_VERSION_conduit(1,1,0)
+sourceDirectory = mapOutput decodeString . CF.sourceDirectory . encodeString
+#else
+
 #ifdef WINDOWS
 sourceDirectory = (liftIO . F.listDirectory) >=> yieldMany
 #else
@@ -438,6 +449,8 @@
             loop ds
 #endif
 
+#endif
+
 -- | Deeply stream the contents of the given directory.
 --
 -- This works the same as @sourceDirectory@, but will not return directories at
@@ -449,6 +462,10 @@
                     => Bool -- ^ Follow directory symlinks
                     -> FilePath -- ^ Root directory
                     -> Producer m FilePath
+#if MIN_VERSION_conduit(1,1,0)
+sourceDirectoryDeep follow = mapOutput decodeString . CF.sourceDirectoryDeep follow . encodeString
+#else
+
 sourceDirectoryDeep followSymlinks =
     start
   where
@@ -471,6 +488,7 @@
             then PosixC.getFileStatus path
             else PosixC.getSymbolicLinkStatus path
         return (PosixC.isDirectory stat)
+#endif
 
 -- | Ignore a certain number of values in the stream.
 --
diff --git a/Data/Conduit/Combinators/Unqualified.hs b/Data/Conduit/Combinators/Unqualified.hs
--- a/Data/Conduit/Combinators/Unqualified.hs
+++ b/Data/Conduit/Combinators/Unqualified.hs
@@ -209,7 +209,14 @@
 import qualified System.Random.MWC as MWC
 import Data.Conduit.Combinators.Internal
 import qualified System.PosixCompat.Files as PosixC
+
+#ifndef WINDOWS
 import qualified System.Posix.Directory as Dir
+#endif
+
+#if MIN_VERSION_conduit(1,1,0)
+import qualified Data.Conduit.Filesystem as CF
+#endif
 
 
 -- END IMPORTS
diff --git a/conduit-combinators.cabal b/conduit-combinators.cabal
--- a/conduit-combinators.cabal
+++ b/conduit-combinators.cabal
@@ -1,5 +1,5 @@
 name:                conduit-combinators
-version:             0.2.4
+version:             0.2.4.1
 synopsis:            Commonly used conduit functions, for both chunked and unchunked data
 description:         Provides a replacement for Data.Conduit.List, as well as a convenient Conduit module.
 homepage:            https://github.com/fpco/conduit-combinators