diff --git a/AUTHORS b/AUTHORS
index cac4aa2..e530a1a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,9 @@ Contributions
   Edd Dumbill <edd [at] com.usefulinc>
    - Contributed APT sources.list file for Ubuntus Dapper release.
 
+  Henning Sprang <henning_sprang [at] de.gmx>
+   - Many suggestions and useful Debian bug reports.
+
   Sven Hertge <sven [at] de.svenhartge>
    - Bugfix for Debian/Gentoo package installation.
 
diff --git a/debian/changelog b/debian/changelog
index 35389db..44111af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+  * New upstream release.
+    - Don't setup ramdisk in xm.tmpl if one isn't being used.
+      (Closes: #383703)
+
 xen-tools (2.3-1) unstable; urgency=high
 
   * Urgency set to high because the software will not work correctly unless
diff --git a/etc/xm.tmpl b/etc/xm.tmpl
index 4903139..8667d85 100644
--- a/etc/xm.tmpl
+++ b/etc/xm.tmpl
@@ -8,7 +8,11 @@
 #  Kernel + memory size
 #
 kernel  = '{$kernel}'
-ramdisk = '{$initrd}'
+{ if ( $initrd )
+  {
+    $OUT.= "ramdisk = '$initrd'\n";
+  }
+}
 memory  = '{$memory}'