diff --git a/debian/changelog b/debian/changelog
index 9e8d9d879..690e7bb35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 cmake (2.8.9-1) UNRELEASED; urgency=low
 
   * New upstream release (no upstream changes since RC3).
+  * Make FindPostgreSQL find headers on Debian. Thanks to Pere Nubiola i
+    Radigales and Gregor Jasny. (Closes: #665721)
+    Patch: FindPostgreSQL_665721.diff
 
  -- Modestas Vainius <modax@debian.org>  Sat, 18 Aug 2012 22:36:44 +0300
 
diff --git a/debian/patches/FindPostgreSQL_665721.diff b/debian/patches/FindPostgreSQL_665721.diff
new file mode 100644
index 000000000..39adbaf92
--- /dev/null
+++ b/debian/patches/FindPostgreSQL_665721.diff
@@ -0,0 +1,18 @@
+Description: Find postgresql headers on Debian
+Author: Pere Nubiola i Radigales <pere@nubiola.cat>
+Author: Gregor Jasny <gjasny@googlemail.com>
+Bug: http://bugs.debian.org/665721
+Acked-By: Modestas Vainius <modax@debian.org>
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665721#17
+Last-Update: 2012-08-18
+
+--- a/Modules/FindPostgreSQL.cmake
++++ b/Modules/FindPostgreSQL.cmake
+@@ -116,6 +116,7 @@
+    # Look in other places.
+    ${PostgreSQL_ROOT_DIRECTORIES}
+   PATH_SUFFIXES
++    postgresql
+     pgsql/server
+     postgresql/server
+     include/server
diff --git a/debian/patches/series b/debian/patches/series
index cc249dfeb..47ba5d46e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 FindBoost_add_-lpthread_#563479.diff
 multiarch_findgtk2_fix.diff
+FindPostgreSQL_665721.diff