diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # hw-conduit
-[![0.0-branch](https://circleci.com/gh/haskell-conduit/hw-conduit/tree/0.0-branch.svg?style=svg)](https://circleci.com/gh/haskell-conduit/hw-conduit/tree/0.0-branch)
+
+[![CircleCI](https://circleci.com/gh/haskell-works/hw-conduit.svg?style=svg)](https://circleci.com/gh/haskell-works/hw-conduit)
 
 Extra facilities for conduits.
diff --git a/hw-conduit.cabal b/hw-conduit.cabal
--- a/hw-conduit.cabal
+++ b/hw-conduit.cabal
@@ -1,80 +1,92 @@
--- This file has been generated from package.yaml by hpack version 0.18.1.
---
--- see: https://github.com/sol/hpack
-
-name:           hw-conduit
-version:        0.2.0.5
-synopsis:       Conduits for tokenizing streams.
-description:    Conduits for tokenizing streams. Please see README.md
-category:       Data, Conduit
-homepage:       http://github.com/haskell-works/hw-conduit#readme
-bug-reports:    https://github.com/haskell-works/hw-conduit/issues
-author:         John Ky
-maintainer:     newhoggy@gmail.com
-copyright:      2016 John Ky
-license:        MIT
-license-file:   LICENSE
-build-type:     Simple
-cabal-version:  >= 1.10
+cabal-version:      2.2
 
+name:                 hw-conduit
+version:              0.2.0.6
+synopsis:             Conduits for tokenizing streams.
+description:          Conduits for tokenizing streams. Please see README.md
+category:             Data, Conduit
+homepage:             http://github.com/haskell-works/hw-conduit#readme
+bug-reports:          https://github.com/haskell-works/hw-conduit/issues
+author:               John Ky
+maintainer:           newhoggy@gmail.com
+copyright:            2016-2019 John Ky
+license:              MIT
+license-file:         LICENSE
+tested-with:          GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
+build-type:           Simple
 extra-source-files:
-    README.md
+  README.md
 
+common base                 { build-depends: base                 >= 4.9        && < 5      }
+
+common array                { build-depends: array                >= 0.5        && < 0.6    }
+common bytestring           { build-depends: bytestring           >= 0.9        && < 0.11   }
+common conduit              { build-depends: conduit              >= 1.2        && < 1.4    }
+common conduit-combinators  { build-depends: conduit-combinators  >= 1.0        && < 1.4    }
+common criterion            { build-depends: criterion            >= 1.2        && < 1.6    }
+common hspec                { build-depends: hspec                >= 2.4        && < 2.8    }
+common mmap                 { build-depends: mmap                 >= 0.5        && < 0.6    }
+common time                 { build-depends: time                 >= 1.4        && < 1.10   }
+common transformers         { build-depends: transformers         >= 0.4        && < 0.6    }
+common unliftio-core        { build-depends: unliftio-core        >= 0.1.2.0    && < 0.2    }
+common vector               { build-depends: vector               >= 0.12       && < 0.13   }
+common word8                { build-depends: word8                >= 0.1        && < 0.2    }
+
+common config
+  default-language:     Haskell2010
+
+common hw-conduit
+  build-depends:        hw-conduit
+
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-conduit
 
 library
-  hs-source-dirs:
-      src
-  ghc-options: -Wall -O2 -msse4.2
-  build-depends:
-      base >=4.9 && <5
-    , bytestring
-    , conduit
-    , array
-    , conduit-combinators
-    , transformers
-    , word8
-    , time
-    , unliftio-core
-  exposed-modules:
-      HaskellWorks.Data.Conduit.ByteString
-      HaskellWorks.Data.Conduit.Combinator
-      HaskellWorks.Data.Conduit.List
-  other-modules:
-      Paths_hw_conduit
-  default-language: Haskell2010
+  import:               base, config
+                      , array
+                      , bytestring
+                      , conduit
+                      , conduit-combinators
+                      , time
+                      , transformers
+                      , unliftio-core
+                      , word8
+  exposed-modules:      HaskellWorks.Data.Conduit.ByteString
+                        HaskellWorks.Data.Conduit.Combinator
+                        HaskellWorks.Data.Conduit.List
+  other-modules:        Paths_hw_conduit
+  autogen-modules:      Paths_hw_conduit
+  hs-source-dirs:       src
+  ghc-options:          -Wall -O2 -msse4.2
 
 test-suite hw-conduit-test
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
-  hs-source-dirs:
-      test
-  ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      base >=4.9 && <5
-    , bytestring
-    , conduit
-    , hspec
-    , hw-conduit
-  other-modules:
-      HaskellWorks.Data.Conduit.ByteStringSpec
-      HaskellWorks.Data.Conduit.CombinatorSpec
-  default-language: Haskell2010
+  import:               base, config
+                      , bytestring
+                      , conduit
+                      , hspec
+                      , hw-conduit
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  hs-source-dirs:       test
+  ghc-options:          -Wall -threaded -rtsopts -with-rtsopts=-N
+  build-tool-depends:   hspec-discover:hspec-discover
+  autogen-modules:      Paths_hw_conduit
+  other-modules:        HaskellWorks.Data.Conduit.ByteStringSpec
+                        HaskellWorks.Data.Conduit.CombinatorSpec
+                        Paths_hw_conduit
 
 benchmark bench
-  type: exitcode-stdio-1.0
-  main-is: Main.hs
-  hs-source-dirs:
-      bench
-  ghc-options: -Wall -O2 -msse4.2
-  build-depends:
-      base >=4.9 && <5
-    , bytestring
-    , conduit
-    , criterion
-    , hw-conduit
-    , mmap
-    , vector
-  default-language: Haskell2010
+  import:               base, config
+                      , bytestring
+                      , conduit
+                      , criterion
+                      , hw-conduit
+                      , mmap
+                      , vector
+  type:                 exitcode-stdio-1.0
+  main-is:              Main.hs
+  other-modules:        Paths_hw_conduit
+  autogen-modules:      Paths_hw_conduit
+  hs-source-dirs:       bench
+  ghc-options:          -Wall -O2 -msse4.2