diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2014, Sebastian Dröge
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Sebastian Dröge nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Network/Connection/Conduit.hs b/Network/Connection/Conduit.hs
new file mode 100644
--- /dev/null
+++ b/Network/Connection/Conduit.hs
@@ -0,0 +1,53 @@
+{-# LANGUAGE RankNTypes #-}
+-- | A @conduit@ source and sink based on "Network.Connection" from the
+-- @connection@ package, and ResourceT aware constructors.
+module Network.Connection.Conduit
+    ( -- * Source and sink
+      sourceConnection
+    , sinkConnection
+      -- * ResourceT aware constructors
+    , connectFromHandle
+    , connectTo
+    ) where
+
+import Data.Conduit
+import qualified Network.Connection as C
+import Data.ByteString (ByteString)
+import qualified Data.ByteString as BS
+import Control.Monad.IO.Class (MonadIO (liftIO))
+import Control.Monad.Trans.Class (lift)
+import Control.Monad.Trans.Resource
+import Control.Monad (unless)
+import System.IO (Handle)
+
+-- | Stream the data from the connection. This does not close the connection
+-- on completion
+sourceConnection :: MonadIO m => C.Connection -> Producer m ByteString
+sourceConnection connection =
+    loop
+  where
+    loop = do
+        bs <- lift $ liftIO $ C.connectionGetChunk connection
+        unless (BS.null bs) $
+            yield bs >> loop
+
+-- | Stream all incoming data to the connection. This does not close the
+-- connection on completion.
+sinkConnection :: MonadIO m => C.Connection -> Consumer ByteString m ()
+sinkConnection connection =
+    loop
+  where
+    loop = await >>= maybe (return ()) (\bs -> lift (liftIO $ C.connectionPut connection bs) >> loop)
+
+-- | Create a new connection from a handle. See 'Network.Connection.connectFromHandle'.
+connectFromHandle :: (MonadResource m) => C.ConnectionContext -> Handle -> C.ConnectionParams -> m C.Connection
+connectFromHandle ctx h params = do
+    (_, c) <- liftResourceT $ allocate (C.connectFromHandle ctx h params) C.connectionClose
+    return c
+
+-- | Create a new connection. See 'Network.Connection.connectTo'.
+connectTo :: (MonadResource m) => C.ConnectionContext -> C.ConnectionParams -> m C.Connection
+connectTo ctx params = do
+    (_, c) <- liftResourceT $ allocate (C.connectTo ctx params) C.connectionClose
+    return c
+
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/conduit-connection.cabal b/conduit-connection.cabal
new file mode 100644
--- /dev/null
+++ b/conduit-connection.cabal
@@ -0,0 +1,29 @@
+name:                conduit-connection
+version:             0.1.0.0
+synopsis:            Conduit source and sink for Network.Connection.
+description:
+    @conduit-connection@ provides a @conduit@ source and sink based on @connection@.
+homepage:            https://github.com/sdroege/conduit-connection
+license:             BSD3
+license-file:        LICENSE
+author:              Sebastian Dröge
+maintainer:          slomo@coaxion.net
+category:            Network, Conduit
+build-type:          Simple
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Network.Connection.Conduit
+  build-depends:       base == 4.*
+                     , transformers >= 0.2 && < 0.5
+                     , bytestring >=0.10 && <0.11
+                     , resourcet >= 1.1 && < 1.2
+                     , conduit >=1.1 && <1.2
+                     , connection >=0.2 && <0.3
+  default-language:    Haskell2010
+  ghc-options:         -Wall
+
+source-repository head
+  type:     git
+  location: git://github.com/sdroege/conduit-connection.git
+