diff -u scim-kmfl-imengine-0.9.8/debian/control scim-kmfl-imengine-0.9.8/debian/control
--- scim-kmfl-imengine-0.9.8/debian/control
+++ scim-kmfl-imengine-0.9.8/debian/control
@@ -1,8 +1,7 @@
 Source: scim-kmfl-imengine
 Priority: optional
 Section: utils
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Doug Rintoul <doug_rintoul@sil.org>
+Maintainer: Doug Rintoul <doug_rintoul@sil.org>
 Uploaders: Torsten Werner <twerner@debian.org>
 Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.0.0), libkmflcomp-dev, libkmfl-dev, libscim-dev (>=1.4.4), libxkbfile-dev, intltool
 Standards-Version: 3.8.0
diff -u scim-kmfl-imengine-0.9.8/debian/rules scim-kmfl-imengine-0.9.8/debian/rules
--- scim-kmfl-imengine-0.9.8/debian/rules
+++ scim-kmfl-imengine-0.9.8/debian/rules
@@ -5,7 +5,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_SHLIBDEPS_INCLUDE := debian/scim-kmfl-imengine/usr/lib/
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
diff -u scim-kmfl-imengine-0.9.8/debian/changelog scim-kmfl-imengine-0.9.8/debian/changelog
--- scim-kmfl-imengine-0.9.8/debian/changelog
+++ scim-kmfl-imengine-0.9.8/debian/changelog
@@ -1,11 +1,10 @@
-scim-kmfl-imengine (0.9.8-1ubuntu1) karmic; urgency=low
+scim-kmfl-imengine (0.9.8-1.1) unstable; urgency=low
 
-  * debian/patches/01_missing_include.patch:
-    - Add missing '#include' to fix FTBFS. (LP: #391669)
-  * debian/rules: Added include for simple-patchsys.mk.
-  * debian/control: Updated Maintainer field to match Ubuntu MOTU Developers.
+  * Non-maintainer upload.
+  * Fix "FTBFS with GCC 4.4: missing #include" by applying Martin Michlmayr's
+    patch (closes: #526210).
 
- -- Andres Rodriguez <andreserl@ubuntu.com>  Wed, 24 Jun 2009 10:47:37 -0500
+ -- gregor herrmann <gregoa@debian.org>  Fri, 25 Dec 2009 22:34:16 +0100
 
 scim-kmfl-imengine (0.9.8-1)  unstable; urgency=low
 
reverted:
--- scim-kmfl-imengine-0.9.8/debian/patches/01_missing_include.patch
+++ scim-kmfl-imengine-0.9.8.orig/debian/patches/01_missing_include.patch
@@ -1,11 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' scim-kmfl-imengine-0.9.8/src/xkbmap.cpp scim-kmfl-imengine-0.9.8.new/src/xkbmap.cpp
---- scim-kmfl-imengine-0.9.8/src/xkbmap.cpp	2009-01-08 12:55:01.000000000 -0500
-+++ scim-kmfl-imengine-0.9.8.new/src/xkbmap.cpp	2009-06-24 10:40:58.000000000 -0500
-@@ -20,6 +20,7 @@
-  *
-  */
- 
-+#include <stdio.h>
- #include <stdlib.h>
- #include <iostream>
- #include <iomanip>
only in patch2:
unchanged:
--- scim-kmfl-imengine-0.9.8.orig/src/xkbmap.cpp
+++ scim-kmfl-imengine-0.9.8/src/xkbmap.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
 #include <iomanip>