diff -u twiki-4.1.2/debian/postinst twiki-4.1.2/debian/postinst
--- twiki-4.1.2/debian/postinst
+++ twiki-4.1.2/debian/postinst
@@ -97,7 +97,7 @@
 #	    fi
 #	done
 
-	servers="apache apache-perl apache-ssl apache2"
+	servers="apache2 apache-perl apache-ssl apache mini-httpd"
 	for server in $servers; do 
 		if [ -e /etc/$server/conf.d ]; then
 			includefile=/etc/twiki/apache.conf
@@ -205,6 +205,18 @@
 	# reload apache configs
 	for server in $servers; do
 		if [ -e /etc/init.d/$server ]; then
+			case "$server" in
+			    apache|apache-*)
+			        if [ ! -x /usr/sbin/apachectl ]; then
+        	                    continue
+				fi
+			    ;;
+			    apache2)
+        	                if [ ! -x /usr/sbin/apache2ctl ]; then
+        	                    continue
+        	                fi
+	                    ;;
+	                esac
 			echo reloading $server config
                 	/etc/init.d/$server reload
 		fi
diff -u twiki-4.1.2/debian/control twiki-4.1.2/debian/control
--- twiki-4.1.2/debian/control
+++ twiki-4.1.2/debian/control
@@ -1,7 +1,8 @@
 Source: twiki
 Section: web
 Priority: optional
-Maintainer: Sven Dowideit <svenud@ozemail.com.au>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sven Dowideit <svenud@ozemail.com.au>
 Build-Depends: debhelper (>= 5), tardy, po-debconf, dpatch
 Standards-Version: 3.7.2
 
diff -u twiki-4.1.2/debian/changelog twiki-4.1.2/debian/changelog
--- twiki-4.1.2/debian/changelog
+++ twiki-4.1.2/debian/changelog
@@ -1,3 +1,12 @@
+twiki (1:4.1.2-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable. (LP: #261962) remaining changes:
+    - Prefer apache2 to apache in the webserver list, and add mini-httpd.
+    - Only attempt to restart any of the apache's if /usr/sbin/apachectl
+      exists and is executable, doing the same favour for apache2.
+
+ -- Stefan Ebner <sebner@ubuntu.com>  Tue, 26 Aug 2008 00:52:52 +0100
+
 twiki (1:4.1.2-4) unstable; urgency=emergency
 
   * move session files to /var/lib/twiki/working/tmp (Closes: #494648)
@@ -8,6 +17,17 @@
 
  -- Sven Dowideit <SvenDowideit@DistributedINFORMATION.com>  Thu, 14 Aug 2008 09:53:40 +0100
 
+twiki (1:4.1.2-3.2ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian Unstable (LP: #182415), remaining Ubuntu changes:
+    - Add a horrible hack to try and detect if htpasswd supports -b.
+    - Prefer apache2 to apache in the webserver list, and add mini-httpd.
+    - Only attempt to restart any of the apache's if /usr/sbin/apachectl
+      exists and is executable, doing the same favour for apache2.
+    - Update Maintainer field as per spec
+
+ -- Emanuele Gentili <emgent@ubuntu.com>  Sun, 20 Jul 2008 19:30:18 +0200
+
 twiki (1:4.1.2-3.2) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -37,6 +57,17 @@
 
  -- Olivier Berger <olivier.berger@it-sudparis.eu>  Wed, 16 Jul 2008 15:04:09 +0200
 
+twiki (1:4.1.2-3.1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian Unstable (LP: #182415), remaining Ubuntu changes:
+    - Add a horrible hack to try and detect if htpasswd supports -b.
+    - Prefer apache2 to apache in the webserver list, and add mini-httpd.
+    - Only attempt to restart any of the apache's if /usr/sbin/apachectl
+      exists and is executable, doing the same favour for apache2.
+    - Update Maintainer field as per spec
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sun, 13 Jan 2008 14:25:34 +0100
+
 twiki (1:4.1.2-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -62,6 +93,17 @@
 
  -- Sven Dowideit <SvenDowideit@DistributedINFORMATION.com>  Sun, 14 Oct 2007 09:53:40 +0100 
 
+twiki (1:4.1.2-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable.
+  * Remaining Ubuntu changes:
+    - Add a horrible hack to try and detect if htpasswd supports -b.
+    - Prefer apache2 to apache in the webserver list, and add mini-httpd.
+    - Only attempt to restart any of the apache's if /usr/sbin/apachectl
+      exists and is executable, doing the same favour for apache2.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 18 May 2007 21:11:48 +1000
+
 twiki (1:4.1.2-1) unstable; urgency=low
 
   * add commented out mod_perl on apache 2 support using IFModule
@@ -71,6 +113,18 @@
 
  -- Sven Dowideit <SvenDowideit@DistributedINFORMATION.com>  Sun, 15 Apr 2007 08:53:40 +0100
 
+twiki (1:4.0.5-9.1ubuntu1) feisty; urgency=low
+
+  * Add a horrible hack to try and detect if htpasswd supports -b.
+    Now I feel dirty. (LP: #93669)
+  * Prefer apache2 to apache in the webserver list, and add mini-httpd.
+  * Only attempt to restart any of the apache's if /usr/sbin/apachectl
+    exists and is executable. (LP: #96464)
+  * Do the same thing for Apache 2.
+  * Munge Maintainer field as per spec.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sun,  8 Apr 2007 00:09:06 +1000
+
 twiki (1:4.0.5-9.1) unstable; urgency=low
 
   * Non-maintainer upload.