diff --git a/Database/HaskellDB/HDBC.hs b/Database/HaskellDB/HDBC.hs
--- a/Database/HaskellDB/HDBC.hs
+++ b/Database/HaskellDB/HDBC.hs
@@ -65,7 +65,7 @@
 	     SqlGenerator
           -> conn
 	  -> PrimQuery 
-	  -> Rel er 
+	  -> Rel er
 	  -> IO [Record vr]
 hdbcQuery gen connection q rel = hdbcPrimQuery connection sql scheme rel
     where sql = show $ ppSql $ sqlQuery gen q
@@ -126,6 +126,8 @@
             SqlTimestampT     -> CalendarTimeT
             SqlUTCDateTimeT   -> CalendarTimeT
             SqlUTCTimeT       -> CalendarTimeT
+            SqlTimeWithZoneT  -> CalendarTimeT
+            SqlTimestampWithZoneT -> CalendarTimeT
             SqlIntervalT _    -> string
             SqlGUIDT          -> string
             SqlUnknownT _     -> string
@@ -163,7 +165,7 @@
 		 conn -- ^ Database connection.
 	      -> String     -- ^ SQL query
 	      -> Scheme     -- ^ List of field names to retrieve
-	      -> Rel er     -- ^ Phantom argument to get the return type right.
+	      -> Rel er   -- ^ Phantom argument to get the return type right.
 	      -> IO [Record vr]    -- ^ Query results
 hdbcPrimQuery conn sql scheme rel = 
     do
diff --git a/haskelldb-hdbc.cabal b/haskelldb-hdbc.cabal
--- a/haskelldb-hdbc.cabal
+++ b/haskelldb-hdbc.cabal
@@ -1,25 +1,25 @@
 Name: haskelldb-hdbc
-Version: 0.13
-Cabal-version: >= 1.2
+Version: 2.0
+Cabal-version: >= 1.6
 Build-type: Simple
 Copyright: The authors
+Homepage: http://trac.haskell.org/haskelldb
 Maintainer: haskelldb-users@lists.sourceforge.net
 Author: Daan Leijen, Conny Andersson, Martin Andersson, Mary Bergman, Victor Blomqvist, Bjorn Bringert, Anders Hockersten, Torbjorn Martin, Jeremy Shaw
 License: BSD3
-Synopsis: HaskellDB support for HDBC. You will also need one
-          or more back-end specific packages.
-
-Flag split-base
+Synopsis: HaskellDB support for HDBC.
 
 Library
-  Build-depends: mtl >= 1 && < 2, haskelldb >= 0.12 && < 1, HDBC >= 2 && < 3, convertible >= 1.0.1
-  if flag(split-base)
-    Build-depends: base >= 3 && < 5, containers < 1, old-time >= 1 && < 2
-  else
-    Build-depends: base < 3
+  Build-depends: mtl >= 1 && < 2, haskelldb >= 2 && < 3, HDBC >= 2 && < 3, convertible >= 1.0.1 && < 2
+  Build-depends: base >= 3 && < 5, containers >= 0.2 && < 1, old-time >= 1 && < 2
   Extensions: ExistentialQuantification,
             OverlappingInstances,
             UndecidableInstances,
             MultiParamTypeClasses
   Exposed-Modules:
         Database.HaskellDB.HDBC
+  ghc-options: -fwarn-incomplete-patterns
+
+Source-repository head
+  Type:       darcs
+  Location:   http://code.haskell.org/haskelldb