diff -Nru base-files-6.4ubuntu3/debian/changelog base-files-6.4ubuntu4/debian/changelog
--- base-files-6.4ubuntu3/debian/changelog	2011-07-22 18:59:38.000000000 +0200
+++ base-files-6.4ubuntu4/debian/changelog	2011-08-03 11:06:49.000000000 +0200
@@ -1,3 +1,13 @@
+base-files (6.4ubuntu4) oneiric; urgency=low
+
+  * debian/preinst:
+    - fix conffile prompt for unmodified 00-header, 10-help-text 
+      (LP: #820233)
+  * debian/rules:
+    - install the preinst into the package as no helper is used
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 03 Aug 2011 10:44:29 +0200
+
 base-files (6.4ubuntu3) oneiric; urgency=low
 
   * add update-motd.d files to conffiles (LP: #813282)
diff -Nru base-files-6.4ubuntu3/debian/preinst base-files-6.4ubuntu4/debian/preinst
--- base-files-6.4ubuntu3/debian/preinst	1970-01-01 01:00:00.000000000 +0100
+++ base-files-6.4ubuntu4/debian/preinst	2011-08-03 11:00:12.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+rm_if_matches_md5sum() {
+    F="$1"
+    M="$2"
+    if [ -e "$F" ]; then
+        md5=$(md5sum "$F" | cut -f 1 -d\ )
+        if [ "$md5" = "$M" ]; then
+	    rm "$F"
+        fi
+    fi
+}
+
+
+case "$1" in
+  install|upgrade)
+      # older versions did not ship 00-header/10-help-text as conffiles but
+      # newer do, because the content changed this triggers a conffile prompt
+      # now. by removing the file (if unmodified) we avoid this prompt and
+      # dpkg will re-create it
+      if dpkg --compare-versions "$2" le-nl "6.4ubuntu4"; then
+          rm_if_matches_md5sum "/etc/update-motd.d/00-header" "4241925109d5d9fc869f20143dbd4054"
+          rm_if_matches_md5sum "/etc/update-motd.d/10-help-text" "918a1e4bc361b759adff1fabbcd8fb8f"
+      fi
+  ;;
+esac
diff -Nru base-files-6.4ubuntu3/debian/rules base-files-6.4ubuntu4/debian/rules
--- base-files-6.4ubuntu3/debian/rules	2011-07-08 19:13:55.000000000 +0200
+++ base-files-6.4ubuntu4/debian/rules	2011-08-03 11:05:25.000000000 +0200
@@ -41,6 +41,7 @@
 	sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in \
 		> debian/tmp/DEBIAN/postinst
 	chmod 755 debian/tmp/DEBIAN/postinst
+	install -p -m 755 debian/preinst debian/tmp/DEBIAN/preinst
 	cd debian && install -m 644 conffiles tmp/DEBIAN
 	cd debian/tmp && install -d `cat ../directory-list`
 	install -p -m 644 share/* debian/tmp/usr/share/base-files