diff --git a/doctest/DoctestDriver.hs b/doctest/DoctestDriver.hs
new file mode 100644
--- /dev/null
+++ b/doctest/DoctestDriver.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+
+#if MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
+{-# OPTIONS_GHC -F -pgmF doctest-discover #-}
+#else
+module Main where
+
+import qualified System.IO as IO
+
+main :: IO ()
+main = IO.putStrLn "WARNING: doctest will not run on GHC versions earlier than 8.4.4"
+#endif
diff --git a/hw-conduit.cabal b/hw-conduit.cabal
--- a/hw-conduit.cabal
+++ b/hw-conduit.cabal
@@ -1,7 +1,7 @@
-cabal-version:      2.2
+cabal-version: 2.2
 
 name:                 hw-conduit
-version:              0.2.0.6
+version:              0.2.1.0
 synopsis:             Conduits for tokenizing streams.
 description:          Conduits for tokenizing streams. Please see README.md
 category:             Data, Conduit
@@ -9,28 +9,29 @@
 bug-reports:          https://github.com/haskell-works/hw-conduit/issues
 author:               John Ky
 maintainer:           newhoggy@gmail.com
-copyright:            2016-2019 John Ky
+copyright:            2016-2020 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
+tested-with:          GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4
 build-type:           Simple
-extra-source-files:
-  README.md
+extra-source-files:   README.md
 
-common base                 { build-depends: base                 >= 4.9        && < 5      }
+common base                       { build-depends: base                       >= 4.11       && < 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 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 doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.17   }
+common doctest-discover           { build-depends: doctest-discover           >= 0.2        && < 0.3    }
+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.3    }
+common vector                     { build-depends: vector                     >= 0.12       && < 0.13   }
+common word8                      { build-depends: word8                      >= 0.1        && < 0.2    }
 
 common config
   default-language:     Haskell2010
@@ -71,10 +72,8 @@
   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
   import:               base, config
@@ -86,7 +85,17 @@
                       , 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
+
+test-suite doctest
+  import:               base, config
+                      , doctest
+                      , doctest-discover
+                      , hw-conduit
+  default-language:     Haskell2010
+  type:                 exitcode-stdio-1.0
+  ghc-options:          -threaded
+  main-is:              DoctestDriver.hs
+  HS-Source-Dirs:       doctest
+  build-tool-depends:   doctest-discover:doctest-discover