diff -u gimp-2.6.6/debian/rules gimp-2.6.6/debian/rules
--- gimp-2.6.6/debian/rules
+++ gimp-2.6.6/debian/rules
@@ -20,7 +20,7 @@
 DEB_BUILDDIR := $(DEB_SRCDIR)/build
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := -Llibgimp2.0 -l$(CURDIR)/debian/libgimp2.0/usr/lib
-DEB_DH_SHLIBDEPS_ARGS_gimp := -Xlibcontroller_midi.so
+DEB_DH_SHLIBDEPS_ARGS_gimp := -Xlibcontroller-midi.so
 
 clean::
 	rm -rf build
diff -u gimp-2.6.6/debian/changelog gimp-2.6.6/debian/changelog
--- gimp-2.6.6/debian/changelog
+++ gimp-2.6.6/debian/changelog
@@ -1,3 +1,26 @@
+gimp (2.6.6-1ubuntu1) karmic; urgency=low
+
+  * Merge with Debian unstable (LP: #389900), remaining changes:
+    - debian/patches/02_help-message.patch,
+      debian/patches/03_gimp.desktop.in.in.patch:
+      + updated some strings for ubuntu
+    - debian/rules:
+      + updated translation templates
+    - debian/control:
+      + Drop webkit build dependency. gimp is the only thing pulling in webkit
+        for the desktop CDs, and makes them explode. Without the webkit help
+        browser plugin, help will just be displayed in the default browser.
+
+ -- Iain Lane <laney@ubuntu.com>  Sun, 21 Jun 2009 17:20:03 +0100
+
+gimp (2.6.6-1) unstable; urgency=low
+
+  * New upstream release
+    - Save two-color PBMs properly, and don't invert the colors
+      (Closes: #517502)
+
+ -- Ari Pollak <ari@debian.org>  Sun, 22 Mar 2009 21:39:55 -0400
+
 gimp (2.6.6-0ubuntu1) jaunty; urgency=low
 
   * New upstream release (LP: #344052)
@@ -6,6 +29,12 @@
 
  -- Pedro Fragoso <ember@ubuntu.com>  Tue, 17 Mar 2009 03:00:24 +0000
 
+gimp (2.6.5-2) unstable; urgency=low
+
+  * Bump build-dep on intltool (Closes: #518373)
+
+ -- Ari Pollak <ari@debian.org>  Fri, 06 Mar 2009 18:25:42 -0500
+
 gimp (2.6.5-1ubuntu3) jaunty; urgency=low
 
   * debian/patches/04_from_bugzilla_572403.patch:
@@ -2333 +2361,0 @@
-
diff -u gimp-2.6.6/debian/control gimp-2.6.6/debian/control
--- gimp-2.6.6/debian/control
+++ gimp-2.6.6/debian/control
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Ari Pollak <ari@debian.org>
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.37), autotools-dev,
- patchutils, gettext, intltool, libx11-dev, libice-dev, libsm-dev,
+ patchutils, gettext, intltool (>= 0.36.3), libx11-dev, libice-dev, libsm-dev,
  libxmu-dev, libxpm-dev, libxt-dev,
  libaa1-dev, libgtk2.0-dev (>= 2.10.13), libglib2.0-dev (>= 2.16.0),
  libpango1.0-dev (>= 1.12.2), libjpeg62-dev,
@@ -88,7 +88,7 @@
 Package: gimp-dbg
 Priority: extra
 Architecture: any
-Section: graphics
+Section: debug
 Depends: gimp (= ${binary:Version}) | libgimp2.0 (= ${source:Version}), ${shlibs:Depends}
 Description: Debugging symbols for GIMP
  This package includes the debugging symbols useful for debugging