diff --git a/HDBC-postgresql.cabal b/HDBC-postgresql.cabal
--- a/HDBC-postgresql.cabal
+++ b/HDBC-postgresql.cabal
@@ -1,7 +1,7 @@
 Name: HDBC-postgresql
-Version: 2.5.0.1
+Version: 2.5.0.2
 License: BSD3
-Maintainer: Nicolas Wu <nicolas.wu@gmail.com>
+Maintainer: Nicolas Wu <nicolas.wu@gmail.com>, David Johnson <code@dmj.io>
 Author: John Goerzen
 Copyright: Copyright (c) 2005-2011 John Goerzen
 license-file: LICENSE
@@ -21,7 +21,7 @@
 Cabal-Version: >=1.10
 
 custom-setup
-  setup-depends: Cabal >= 1.8, base < 5
+  setup-depends: Cabal >= 1.8 && < 3.17, base < 5
 
 Flag splitBase
   description: Choose the new smaller, split-up package.
@@ -45,7 +45,7 @@
   Build-Depends: base >= 3 && < 5, mtl, HDBC>=2.2.0, parsec, utf8-string,
                  bytestring, old-time, convertible
   if flag(minTime15)
-    Build-Depends: time >= 1.5 && < 1.14
+    Build-Depends: time >= 1.5 && < 1.17
     CPP-Options: -DMIN_TIME_15
   else
     Build-Depends: time < 1.5, old-locale
@@ -63,7 +63,7 @@
                      convertible, parsec, utf8-string,
                      bytestring, old-time, base >= 4.6 && < 5.0, HDBC>=2.2.6
       if flag(minTime15)
-        Build-Depends: time >= 1.5 && < 1.14
+        Build-Depends: time >= 1.5 && < 1.17
         CPP-Options: -DMIN_TIME_15
       else
         Build-Depends: time < 1.5, old-locale
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,5 +1,5 @@
 #!/usr/bin/env runhaskell
-{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
+{-# LANGUAGE CPP, MultiParamTypeClasses, FlexibleInstances #-}
 
 import Distribution.Simple
 import Distribution.PackageDescription
@@ -8,6 +8,9 @@
 import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Program
 import Distribution.Verbosity
+#if MIN_VERSION_Cabal(3,14,0)
+import Distribution.Utils.Path
+#endif
 
 import Data.Char (isSpace)
 import Data.List (dropWhile,reverse)
@@ -61,9 +64,14 @@
   libDir <- pgconfig ["--libdir"]
 
   return emptyBuildInfo {
-    extraLibDirs = [strip libDir],
-    includeDirs  = [strip incDir]
+    extraLibDirs = [toPath $ strip libDir],
+    includeDirs  = [toPath $ strip incDir]
   }
   where
+#if MIN_VERSION_Cabal(3,14,0)
+    toPath = makeSymbolicPath
+#else
+    toPath = id
+#endif
     verbosity = normal -- honestly, this is a hack
     strip x = dropWhile isSpace $ reverse $ dropWhile isSpace $ reverse x