diff --git a/DBDirect.hs b/DBDirect.hs
new file mode 100644
--- /dev/null
+++ b/DBDirect.hs
@@ -0,0 +1,5 @@
+import Database.HaskellDB.HSQL.PostgreSQL
+import Database.HaskellDB.DBDirect
+
+main :: IO ()
+main = dbdirect driver
diff --git a/Database/HaskellDB/HSQL/PostgreSQL.hs b/Database/HaskellDB/HSQL/PostgreSQL.hs
--- a/Database/HaskellDB/HSQL/PostgreSQL.hs
+++ b/Database/HaskellDB/HSQL/PostgreSQL.hs
@@ -32,14 +32,22 @@
 postgresqlConnect opts = 
     hsqlConnect generator (PostgreSQL.connect (server opts) (db opts) (uid opts) (pwd opts))
 
+options :: [(String, String)]
+options =
+    ("server", "Server") :
+    ("db", "Database") :
+    ("uid", "User") :
+    ("pwd", "Password") :
+    []
+
 postgresqlConnectOpts :: MonadIO m => [(String,String)] -> (Database -> m a) -> m a
 postgresqlConnectOpts opts f = 
     do
-    [a,b,c,d] <- getOptions ["server","db","uid","pwd"] opts
+    [a,b,c,d] <- getAnnotatedOptions options opts
     postgresqlConnect (PostgreSQLOptions {server = a, db = b,
                                           uid = c, pwd = d}) f
 
 -- | This driver requires the following options: 
 --   "server", "db", "uid", "pwd"
 driver :: DriverInterface
-driver = defaultdriver { connect = postgresqlConnectOpts }
+driver = defaultdriver { connect = postgresqlConnectOpts, requiredOptions = options }
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,31 @@
+Copyright (c) 1999 Daan Leijen, daan@cs.uu.nl
+Copyright (c) 2003-2004 The HaskellDB development team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the names of the copyright holders nor the names of the
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/haskelldb-hsql-postgresql.cabal b/haskelldb-hsql-postgresql.cabal
--- a/haskelldb-hsql-postgresql.cabal
+++ b/haskelldb-hsql-postgresql.cabal
@@ -1,15 +1,24 @@
 Name: haskelldb-hsql-postgresql
-Version: 0.10
+Version: 1.0.0
+Cabal-version: >= 1.6
+Build-type: Simple
 Copyright: The authors
+Homepage: https://github.com/m4dc4p/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
-build-depends: haskell98, base, mtl, haskelldb, haskelldb-hsql, hsql, hsql-postgresql
-Extensions: ExistentialQuantification,
-            OverlappingInstances,
-            UndecidableInstances,
-            MultiParamTypeClasses
+License-file: LICENSE
 Synopsis: HaskellDB support for the HSQL PostgreSQL driver.
-Exposed-Modules:
+Category: Database
+
+Library
+  Build-depends: base >= 3 && < 5, mtl, haskelldb==0.11, haskelldb-hsql==0.11, hsql, hsql-postgresql
+  Exposed-Modules:
         Database.HaskellDB.HSQL.PostgreSQL
-ghc-options: -O2
+
+Executable DBDirect-hsql-postgresql
+  Main-is: DBDirect.hs
+
+Source-repository head
+  Type:       git
+  Location:   https://github.com/m4dc4p/haskelldb