diff --git a/debian/changelog b/debian/changelog
index 5a824c9c7..6e0c6c78f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ cmake (2.8.1-3) UNRELEASED; urgency=low
       determination code in FindJNI.cmake (based on OpenJDK 1.6.0_18 + icedtea
       patches). This should fix invalid _java_libarch detection on mipsel and
       armel (Closes: #544674).
+    - FindGTK2_pangommconfig.diff - look for Pangomm Config include directory
+      in FindGTK2.cmake (Closes: #579718). Thanks to Sune Vuorela for the
+      patch.
 
  -- Modestas Vainius <modax@debian.org>  Sat, 01 May 2010 22:25:55 +0300
 
diff --git a/debian/patches/FindGTK2_pangommconfig.diff b/debian/patches/FindGTK2_pangommconfig.diff
new file mode 100644
index 000000000..dfbefbf11
--- /dev/null
+++ b/debian/patches/FindGTK2_pangommconfig.diff
@@ -0,0 +1,21 @@
+Author: Sune Vuorela <reportbug@pusling.com>
+Description: Find pangommconfig include directory in FindGTK2
+ There is a small bug in FindGTK2.cmake that makes the include dirs not
+ set properly when using pangomm. Pangomm has, like many of the other
+ libraries, now two include dirs, one for the arch specific 'config'
+ header, and another dir for the arch independent headers.
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579718
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=cmake-find-gtk2-pangomm-config;att=1;bug=579718
+Last-Update: 2010-04-30
+
+--- a/Modules/FindGTK2.cmake
++++ b/Modules/FindGTK2.cmake
+@@ -439,6 +439,7 @@ foreach(_GTK2_component ${GTK2_FIND_COMP
+         _GTK2_FIND_LIBRARY    (GTK2_CAIROMM_LIBRARY cairomm true true)
+ 
+         _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMM_INCLUDE_DIR pangomm.h)
++        _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h)
+         _GTK2_FIND_LIBRARY    (GTK2_PANGOMM_LIBRARY pangomm true true)
+ 
+         _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++_INCLUDE_DIR sigc++/sigc++.h)
diff --git a/debian/patches/series b/debian/patches/series
index 564ab454f..0e179c5d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hurd_platform.diff
 kFreeBSD_fixes.diff
+FindGTK2_pangommconfig.diff
 FindJNI_fix_libarch_determination.diff