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-parser.cabal b/hw-parser.cabal
--- a/hw-parser.cabal
+++ b/hw-parser.cabal
@@ -1,62 +1,75 @@
-cabal-version:  2.2
-
-name:           hw-parser
-version:        0.1.0.2
-synopsis:       Simple parser support
-description:    Simple parser support. Please see README.md
-category:       Data, Parser
-homepage:       http://github.com/haskell-works/hw-parser#readme
-bug-reports:    https://github.com/haskell-works/hw-parser/issues
-author:         John Ky
-maintainer:     newhoggy@gmail.com
-copyright:      2016-2019 John Ky
-license:        BSD-3-Clause
-license-file:   LICENSE
-tested-with:    GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
-build-type:     Simple
+cabal-version: 2.2
 
-extra-source-files:
-    README.md
+name:                   hw-parser
+version:                0.1.1.0
+synopsis:               Simple parser support
+description:            Simple parser support. Please see README.md
+category:               Data, Parser
+homepage:               http://github.com/haskell-works/hw-parser#readme
+bug-reports:            https://github.com/haskell-works/hw-parser/issues
+author:                 John Ky
+maintainer:             newhoggy@gmail.com
+copyright:              2016-2020 John Ky
+license:                BSD-3-Clause
+license-file:           LICENSE
+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
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-parser
 
-common base                 { build-depends: base                 >= 4          && < 5      }
+common base                       { build-depends: base                       >= 4.11       && < 5      }
 
-common attoparsec           { build-depends: attoparsec           >= 0.13       && < 0.14   }
-common bytestring           { build-depends: bytestring           >= 0.10.6     && < 0.11   }
-common hedgehog             { build-depends: hedgehog             >= 1.0        && < 1.1    }
-common hspec                { build-depends: hspec                >= 2.4        && < 3      }
-common hw-hspec-hedgehog    { build-depends: hw-hspec-hedgehog    >= 0.1.0.4    && < 0.2    }
-common hw-prim              { build-depends: hw-prim              >= 0.6.2.21   && < 0.7    }
-common text                 { build-depends: text                 >= 1.2        && < 1.3    }
+common attoparsec                 { build-depends: attoparsec                 >= 0.13       && < 0.14   }
+common bytestring                 { build-depends: bytestring                 >= 0.10.6     && < 0.11   }
+common doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.17   }
+common doctest-discover           { build-depends: doctest-discover           >= 0.2        && < 0.3    }
+common hedgehog                   { build-depends: hedgehog                   >= 1.0        && < 1.1    }
+common hspec                      { build-depends: hspec                      >= 2.4        && < 3      }
+common hw-hspec-hedgehog          { build-depends: hw-hspec-hedgehog          >= 0.1.0.4    && < 0.2    }
+common hw-prim                    { build-depends: hw-prim                    >= 0.6.2.21   && < 0.7    }
+common text                       { build-depends: text                       >= 1.2        && < 1.3    }
 
 common config
-  default-language: Haskell2010
-  ghc-options:      -Wall
+  default-language:     Haskell2010
+  ghc-options:          -Wall
 
+common hw-parser
+  build-depends:        hw-parser
+
 library
-  import:   base, config
-          , attoparsec
-          , bytestring
-          , hw-prim
-          , text
+  import:               base, config
+                      , attoparsec
+                      , bytestring
+                      , hw-prim
+                      , text
   hs-source-dirs:       src
   exposed-modules:      HaskellWorks.Data.Parser
   other-modules:        Paths_hw_parser
   autogen-modules:      Paths_hw_parser
 
 test-suite hw-parser-test
-  import:   base, config
-          , hedgehog
-          , hspec
-          , hw-hspec-hedgehog
+  import:               base, config
+                      , hedgehog
+                      , hspec
+                      , hw-hspec-hedgehog
   type:                 exitcode-stdio-1.0
   main-is:              Spec.hs
   build-depends:        hw-parser
   hs-source-dirs:       test
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N
   build-tool-depends:   hspec-discover:hspec-discover
-  other-modules:        Paths_hw_parser
-  autogen-modules:      Paths_hw_parser
+
+test-suite doctest
+  import:               base, config
+                      , doctest
+                      , doctest-discover
+                      , hw-parser
+  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