diff --git a/arbor-postgres.cabal b/arbor-postgres.cabal
--- a/arbor-postgres.cabal
+++ b/arbor-postgres.cabal
@@ -1,42 +1,54 @@
-name:           arbor-postgres
-version:        0.0.4
-synopsis:       Convenience types and functions for postgresql-simple.
-description:    Please see the README on Github at <https://github.com/arbor/arbor-postgres#readme>
-category:       Services
-homepage:       https://github.com/arbor/arbor-postgres#readme
-bug-reports:    https://github.com/arbor/arbor-postgres/issues
-author:         Arbor Networks
-maintainer:     mayhem@arbor.net
-copyright:      Arbor Networks
-license:        MIT
-license-file:   LICENSE
-build-type:     Simple
-cabal-version:  >= 1.10
-extra-source-files:
-    ChangeLog.md
-    README.md
+cabal-version: 2.2
 
+name:                   arbor-postgres
+version:                0.0.5
+synopsis:               Convenience types and functions for postgresql-simple.
+description:            Please see the README on Github at <https://github.com/arbor/arbor-postgres#readme>
+category:               Services
+homepage:               https://github.com/arbor/arbor-postgres#readme
+bug-reports:            https://github.com/arbor/arbor-postgres/issues
+author:                 Arbor Networks
+maintainer:             mayhem@arbor.net
+copyright:              Arbor Networks
+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:     ChangeLog.md
+                        README.md
+
 source-repository head
   type: git
   location: https://github.com/arbor/arbor-postgres
 
+common base                   { build-depends: base                   >= 4.7      && < 5      }
+
+common bytestring             { build-depends: bytestring             >= 0.10     && < 0.11   }
+common generic-lens           { build-depends: generic-lens           >= 1.2.0.1  && < 2      }
+common lens                   { build-depends: lens                   >= 4.16     && < 5      }
+common network-uri            { build-depends: network-uri            >= 2.6      && < 3      }
+common optparse-applicative   { build-depends: optparse-applicative   >= 0.14     && < 0.16   }
+common postgresql-simple      { build-depends: postgresql-simple      >= 0.5      && < 0.7    }
+common text                   { build-depends: text                   >= 1.2      && < 1.3    }
+
+common config
+  ghc-options:          -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
+  default-language:     Haskell2010
+
 library
-  exposed-modules:
-      Arbor.Postgres.Config
-      Arbor.Postgres.Core
-      Arbor.Postgres.Env
-      Arbor.Postgres.Password
-  other-modules:      Paths_arbor_postgres
-  hs-source-dirs:     src
-  default-extensions: BangPatterns FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving MultiParamTypeClasses OverloadedStrings TupleSections
-  ghc-options:        -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
-  build-depends:
-      base                  >= 4.7      && < 5
-    , bytestring            >= 0.10     && < 0.11
-    , generic-lens          >= 1.0.0.2  && < 2
-    , lens                  >= 4.16     && < 5
-    , network-uri           >= 2.6      && < 3
-    , optparse-applicative  >= 0.14     && < 0.15
-    , postgresql-simple     >= 0.5      && < 0.7
-    , text                  >= 1.2      && < 1.3
-  default-language: Haskell2010
+  import:               base, config
+                      , bytestring
+                      , generic-lens
+                      , lens
+                      , network-uri
+                      , optparse-applicative
+                      , postgresql-simple
+                      , text
+  exposed-modules:      Arbor.Postgres.Config
+                        Arbor.Postgres.Core
+                        Arbor.Postgres.Env
+                        Arbor.Postgres.Password
+  other-modules:        Paths_arbor_postgres
+  autogen-modules:      Paths_arbor_postgres
+  hs-source-dirs:       src
+  default-extensions:   BangPatterns FlexibleContexts FlexibleInstances GeneralizedNewtypeDeriving MultiParamTypeClasses OverloadedStrings TupleSections