diff --git a/debian/changelog b/debian/changelog
index 1536df96e..d9faa3d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ linux-2.6 (2.6.34~rc6-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release
 
+  [ maximilian attems ]
   * topconfig enable IPV6_SIT_6RD, NETFILTER_XT_TARGET_CT, IP_VS_PROTO_SCTP,
     NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512.
+  
+  [ Ben Hutchings ]
+  * Prepare debconf templates for translation (Closes: #576758)
 
  -- maximilian attems <maks@debian.org>  Wed, 05 May 2010 22:57:24 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 1b61413ec..a96579f07 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -145,6 +145,7 @@ $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
 install-base:
 	dh_installchangelogs
 	dh_installdocs
+	dh_installdebconf
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -338,7 +339,7 @@ ifeq ($(MODULES),True)
 endif
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates \
-	  PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
+	  PACKAGE_NAME='$(PACKAGE_NAME)' PACKAGE_DIR='$(PACKAGE_DIR)' REAL_VERSION='$(REAL_VERSION)'
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug \
 	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
@@ -393,7 +394,6 @@ install-image_mips_$(FEATURESET)_r5k-ip32_plain_templates: ARG_BOOTLOADER = arcb
 install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_BOOTLOADER = zipl
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
-	install -d $(PACKAGE_DIR)/DEBIAN
 	for i in $(wildcard debian/templates/temp.image.plain/*); do \
 	  sed \
 	    -e 's,=D,/boot,g' \
@@ -408,10 +408,8 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
 	    -e 's/=V/$(REAL_VERSION)/g' \
 	    -e 's/=M//g' \
 	    -e 's/=S//g' \
-	    $$i > $(PACKAGE_DIR)/DEBIAN/$$(basename $$i); \
+	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i); \
 	done
-	chmod 755 $(PACKAGE_DIR)/DEBIAN/{pre,post}*
-	chmod 644 $(PACKAGE_DIR)/DEBIAN/templates
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
 	dh_installdirs usr/share/bug/$(PACKAGE_NAME)