diff -u grr.app-0.6.2.dfsg/debian/changelog grr.app-0.6.2.dfsg/debian/changelog
--- grr.app-0.6.2.dfsg/debian/changelog
+++ grr.app-0.6.2.dfsg/debian/changelog
@@ -1,3 +1,10 @@
+grr.app (0.6.2.dfsg-5ubuntu1) oneiric; urgency=low
+
+  * debian/patches/link-libs.patch: Use ADDITIONAL_GUI_LIBS rather than
+    ADDITIONAL_LDFLAGS in GNUmakefile.preamble (LP: #770931).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 11 Jul 2011 13:52:49 +0100
+
 grr.app (0.6.2.dfsg-5build2) oneiric; urgency=low
 
   * Rebuild for gnustep-base 0.22 and gnustep-gui 0.20.
diff -u grr.app-0.6.2.dfsg/debian/control grr.app-0.6.2.dfsg/debian/control
--- grr.app-0.6.2.dfsg/debian/control
+++ grr.app-0.6.2.dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: grr.app
 Section: gnustep
 Priority: optional
-Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNUstep maintainers <pkg-gnustep-maintainers@lists.alioth.debian.org>
 Uploaders: Yavor Doganov <yavor@gnu.org>,
 	   Federico Gimenez Nieto <fgimenez@coit.es>
 Build-Depends: debhelper (>= 7),
diff -u grr.app-0.6.2.dfsg/debian/patches/link-libs.patch grr.app-0.6.2.dfsg/debian/patches/link-libs.patch
--- grr.app-0.6.2.dfsg/debian/patches/link-libs.patch
+++ grr.app-0.6.2.dfsg/debian/patches/link-libs.patch
@@ -2,6 +2,8 @@
 
 	* RSSKit/GNUmakefile (libRSSKit_LIBRARIES_DEPEND_UPON): Add
           $(OBJC_LIBS).
+	* GNUmakefile.preamble (ADDITIONAL_LDFLAGS): Rename to...
+	(ADDITIONAL_GUI_LIBS): ...this.
 
 
 --- grr.app-0.6.2.dfsg.orig/RSSKit/GNUmakefile
@@ -17,0 +20,11 @@
+--- grr.app-0.6.2.dfsg.orig/GNUmakefile.preamble
++++ grr.app-0.6.2.dfsg/GNUmakefile.preamble
+@@ -12,7 +12,7 @@
+ ADDITIONAL_CFLAGS += 
+ 
+ # Additional flags to pass to the linker
+-ADDITIONAL_LDFLAGS += -lRSSKit 
++ADDITIONAL_GUI_LIBS += -lRSSKit 
+ 
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS +=