diff --git a/debian/changelog b/debian/changelog
index 3675301ef..2c2da7a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6-33-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Add missing debconf templates for linux-base (Closes: #571558)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Fri, 26 Feb 2010 00:58:00 +0000
+
 linux-2.6 (2.6.33-1~experimental.1) experimental; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_2_6_33
diff --git a/debian/linux-base.templates b/debian/linux-base.templates
new file mode 100644
index 000000000..54bced945
--- /dev/null
+++ b/debian/linux-base.templates
@@ -0,0 +1,36 @@
+Template: linux-base/disk-id-convert-auto
+Type: boolean
+Default: true
+Description: Update disk device ids in system configuration?
+ The new Linux kernel version provides different drivers for some
+ PATA (IDE) controllers.  The names of some hard disk, CD-ROM and
+ tape devices may change.
+ .
+ You are recommended to identify disk devices in configuration files
+ by label or UUID (unique identifier) rather than by device name,
+ which will work with both old and new kernel versions.  Your system
+ configuration can be updated automatically in most cases.
+
+Template: linux-base/disk-id-convert-plan
+Type: boolean
+Default: true
+Description: Apply these configuration changes to disk device ids?
+ These devices will be relabelled:
+ .
+ ${relabel}
+ .
+ These configuration files will be updated:
+ .
+ ${files}
+ .
+ The device ids will be changed as follows:
+ .
+ ${id_map}
+
+Template: linux-base/disk-id-manual
+Type: note
+Description: Please check these configuration files before rebooting
+ These configuration files still use some device names that may
+ change when using the new kernel:
+ .
+ ${unconverted}