diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..e1dbc31 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
;;; Copyright © 2015 Kyle Meyer <k...@kyleam.com>
;;; Copyright © 2015 Chris Marusich <cmmarus...@gmail.com>
+;;; Copyright © 2016 Danny Milosavljevic <danny...@scratchpost.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in
code.")
(define-public python2-sphinx-repoze-autointerface
(package-with-python2 python-sphinx-repoze-autointerface))
+
+(define-public python-psycopg2
+ (package
+ (name "python-psycopg2")
+ (version "2.6.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "psycopg2" version))
+ (sha256
+ (base32
+ "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f)) ; TODO re-enable after providing a test-db.
+ ; Tests would require a postgresql database "psycopg2_test"
+ ; and a running postgresql database management service.
+ (inputs
+ `(("postgresql" ,postgresql))) ; libpq
+ (home-page "http://initd.org/psycopg/";)
+ (synopsis "Python PostgreSQL adapter")
+ (description
+ "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API
2.0.")
+ (license lgpl3+)
+ (properties `((python2-variant . ,(delay python2-psycopg2))))))
+
+(define-public python2-psycopg2
+ (package
+ (inherit (package-with-python2
+ (strip-python2-variant python-psycopg2)))
+ (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
