diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+Copyright (c) 2015, LShift
+
+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 LShift 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/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/machines-zlib.cabal b/machines-zlib.cabal
new file mode 100644
--- /dev/null
+++ b/machines-zlib.cabal
@@ -0,0 +1,23 @@
+name:                machines-zlib
+version:             0.1.0
+synopsis:            Decompression support for machines
+-- description:         
+homepage:            https://github.com/lshift/machines-zlib
+license:             BSD3
+license-file:        LICENSE
+author:              Robin Green
+-- maintainer:          robin@lshift.net
+copyright:           (c) 2015 LShift
+category:            Machines, Compression
+build-type:          Simple
+cabal-version:       >=1.10
+
+library
+  exposed-modules:     Data.Machine.Zlib
+  -- other-modules:       
+  build-depends:       base ==4.7.*,
+                       basic-prelude >=0.3 && <0.4,
+                       machines >=0.4.1 && <0.5,
+                       streaming-commons >=0.1 && <0.2
+  default-language:    Haskell2010
+  hs-source-dirs:      src
diff --git a/src/Data/Machine/Zlib.hs b/src/Data/Machine/Zlib.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/Machine/Zlib.hs
@@ -0,0 +1,27 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+module Data.Machine.Zlib where
+
+import BasicPrelude
+import Control.Exception (throw)
+import Data.Machine
+import Data.Streaming.Zlib
+
+-- | Even though this doesn't actually do any IO, we stay in the IO monad
+-- like Data.Streaming.Zlib does, to avoid any unsafe "black magic".
+gunzipper :: (Functor m, MonadIO m) => ProcessT m ByteString ByteString
+gunzipper = construct $ do
+  inflate <- liftIO . initInflate $ WindowBits 31
+  let go :: (Functor m, MonadIO m) => PlanT (Is ByteString) ByteString m ()
+      go = do
+        bs <- await <|> finish
+        popper <- liftIO <$> liftIO (feedInflate inflate bs)
+        exhaust (handleRes <$> popper) <|> go
+      handleRes PRDone = Nothing
+      handleRes (PRNext bs) = Just bs
+      handleRes (PRError e) = throw e
+      finish :: MonadIO m => PlanT (Is ByteString) ByteString m ByteString
+      finish = do
+        r <- liftIO $ finishInflate inflate
+        yield r
+        stop
+  go