diff --git a/debian/changelog b/debian/changelog
index 7755a9bf5..2c513fa0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low
   * irq: Always define devm_{request_threaded,free}_irq() (fixes FTBFS on
     s390,s390x)
   * [armel] Disable iop32x and ixp4xx flavours (fixes FTBFS)
+  * Clean up maintainer scripts and templating system
+    - Move all templates under debian/templates
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 11 Aug 2013 19:34:47 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 0822ca89d..c4c8eaa0e 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -289,7 +289,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
 
 	install -d $(PACKAGE_DIR)/DEBIAN
 	sed -e 's/=V/$(REAL_VERSION)/g' \
-	  debian/templates/temp.headers.plain/postinst \
+	  debian/templates/headers.plain.postinst.in \
 	  > $(PACKAGE_DIR)/DEBIAN/postinst
 	chmod 755 $(PACKAGE_DIR)/DEBIAN/postinst
 
@@ -430,16 +430,18 @@ install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_templates \
 install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
 
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
-	for i in $(wildcard debian/templates/temp.image.plain/*); do \
+	for i in $(wildcard debian/templates/image.plain.*.in); do \
+	  target=$$(basename $$i .in); \
+	  target=$${target#image.plain.}; \
 	  sed \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
 	    -e 's/=K/$(ARG_KIMAGE)/g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
-	    $$i > debian/$(PACKAGE_NAME).$$(basename $$i) || exit; \
+	    $$i > debian/$(PACKAGE_NAME).$$target || exit; \
 	done
 	mkdir -p debian/$(PACKAGE_NAME).po
-	for i in $(wildcard debian/po/*.po); do \
+	for i in $(wildcard debian/templates/po/*.po); do \
 	  sed \
 	    -e 's/=V/$(REAL_VERSION)/g' \
 	    $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i) || exit; \
diff --git a/debian/templates/temp.headers.plain/postinst b/debian/templates/headers.postinst.in
similarity index 100%
rename from debian/templates/temp.headers.plain/postinst
rename to debian/templates/headers.postinst.in
diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/image.postinst.in
similarity index 100%
rename from debian/templates/temp.image.plain/postinst
rename to debian/templates/image.postinst.in
diff --git a/debian/templates/temp.image.plain/postrm b/debian/templates/image.postrm.in
similarity index 100%
rename from debian/templates/temp.image.plain/postrm
rename to debian/templates/image.postrm.in
diff --git a/debian/templates/temp.image.plain/preinst b/debian/templates/image.preinst.in
similarity index 100%
rename from debian/templates/temp.image.plain/preinst
rename to debian/templates/image.preinst.in
diff --git a/debian/templates/temp.image.plain/prerm b/debian/templates/image.prerm.in
similarity index 100%
rename from debian/templates/temp.image.plain/prerm
rename to debian/templates/image.prerm.in
diff --git a/debian/templates/temp.image.plain/templates b/debian/templates/image.templates.in
similarity index 100%
rename from debian/templates/temp.image.plain/templates
rename to debian/templates/image.templates.in
diff --git a/debian/po/POTFILES.in b/debian/templates/po/POTFILES.in
similarity index 100%
rename from debian/po/POTFILES.in
rename to debian/templates/po/POTFILES.in
diff --git a/debian/po/ca.po b/debian/templates/po/ca.po
similarity index 100%
rename from debian/po/ca.po
rename to debian/templates/po/ca.po
diff --git a/debian/po/cs.po b/debian/templates/po/cs.po
similarity index 100%
rename from debian/po/cs.po
rename to debian/templates/po/cs.po
diff --git a/debian/po/da.po b/debian/templates/po/da.po
similarity index 100%
rename from debian/po/da.po
rename to debian/templates/po/da.po
diff --git a/debian/po/de.po b/debian/templates/po/de.po
similarity index 100%
rename from debian/po/de.po
rename to debian/templates/po/de.po
diff --git a/debian/po/es.po b/debian/templates/po/es.po
similarity index 100%
rename from debian/po/es.po
rename to debian/templates/po/es.po
diff --git a/debian/po/et.po b/debian/templates/po/et.po
similarity index 100%
rename from debian/po/et.po
rename to debian/templates/po/et.po
diff --git a/debian/po/fr.po b/debian/templates/po/fr.po
similarity index 100%
rename from debian/po/fr.po
rename to debian/templates/po/fr.po
diff --git a/debian/po/it.po b/debian/templates/po/it.po
similarity index 100%
rename from debian/po/it.po
rename to debian/templates/po/it.po
diff --git a/debian/po/ja.po b/debian/templates/po/ja.po
similarity index 100%
rename from debian/po/ja.po
rename to debian/templates/po/ja.po
diff --git a/debian/po/nl.po b/debian/templates/po/nl.po
similarity index 100%
rename from debian/po/nl.po
rename to debian/templates/po/nl.po
diff --git a/debian/po/pl.po b/debian/templates/po/pl.po
similarity index 100%
rename from debian/po/pl.po
rename to debian/templates/po/pl.po
diff --git a/debian/po/pt.po b/debian/templates/po/pt.po
similarity index 100%
rename from debian/po/pt.po
rename to debian/templates/po/pt.po
diff --git a/debian/po/pt_BR.po b/debian/templates/po/pt_BR.po
similarity index 100%
rename from debian/po/pt_BR.po
rename to debian/templates/po/pt_BR.po
diff --git a/debian/po/ru.po b/debian/templates/po/ru.po
similarity index 100%
rename from debian/po/ru.po
rename to debian/templates/po/ru.po
diff --git a/debian/po/sk.po b/debian/templates/po/sk.po
similarity index 100%
rename from debian/po/sk.po
rename to debian/templates/po/sk.po
diff --git a/debian/po/sv.po b/debian/templates/po/sv.po
similarity index 100%
rename from debian/po/sv.po
rename to debian/templates/po/sv.po
diff --git a/debian/po/templates.pot b/debian/templates/po/templates.pot
similarity index 100%
rename from debian/po/templates.pot
rename to debian/templates/po/templates.pot
diff --git a/debian/po/tr.po b/debian/templates/po/tr.po
similarity index 100%
rename from debian/po/tr.po
rename to debian/templates/po/tr.po
diff --git a/debian/po/vi.po b/debian/templates/po/vi.po
similarity index 100%
rename from debian/po/vi.po
rename to debian/templates/po/vi.po