diff -u gallery-1.5.7/debian/control gallery-1.5.7/debian/control
--- gallery-1.5.7/debian/control
+++ gallery-1.5.7/debian/control
@@ -1,7 +1,8 @@
 Source: gallery
 Section: web
 Priority: optional
-Maintainer: Michael C. Schultheiss <schultmc@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael C. Schultheiss <schultmc@debian.org>
 Build-Depends: debhelper (>= 4.1.16)
 Standards-Version: 3.7.2
 
diff -u gallery-1.5.7/debian/postrm gallery-1.5.7/debian/postrm
--- gallery-1.5.7/debian/postrm
+++ gallery-1.5.7/debian/postrm
@@ -37,6 +37,7 @@
         esac
     done
 
+    rm -f /etc/gallery/config.php /etc/gallery/htaccess
     rmdir --ignore-fail-on-non-empty /etc/gallery || true
 fi
 
diff -u gallery-1.5.7/debian/changelog gallery-1.5.7/debian/changelog
--- gallery-1.5.7/debian/changelog
+++ gallery-1.5.7/debian/changelog
@@ -1,3 +1,10 @@
+gallery (1.5.7-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Delete config.php and htaccess on purge (from 1.5.5-pl1-1.1ubuntu1)
+
+ -- Christophe Sauthier <christophe.sauthier@gmail.com>  Wed, 24 Oct 2007 11:23:23 +0200
+
 gallery (1.5.7-1) unstable; urgency=low
 
   * New upstream release (Closes: #438509)
@@ -7,6 +14,12 @@
 
  -- Michael C. Schultheiss <schultmc@debian.org>  Sun, 09 Sep 2007 22:08:20 +0000
 
+gallery (1.5.5-pl1-1.1ubuntu1) gutsy; urgency=low
+
+  * Delete config.php and htaccess on purge. (LP: #32521).
+
+ -- Niklas Klein <kleinernik@gmail.com>  Thu, 13 Sep 2007 09:29:20 +0200
+
 gallery (1.5.5-pl1-1.1) unstable; urgency=high
 
   * Non-maintainer upload during BSP