diff --git a/bin/xen-create-image b/bin/xen-create-image
index 81d5232..14943e7 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -254,8 +254,8 @@ Create a configuration file in /etc/xen so that xm can create the new image.
   #
   # Kernel options.
   #
-  initrd     = /boot/initrd.img-2.6.16-2-xen-686
-  kernel     = /boot/vmlinuz-2.6.16-2-xen-686
+  kernel      = /boot/vmlinuz-`uname -r`
+  initrd      = /boot/initrd.img-`uname -r`
 
   #
   # Networking options.
@@ -564,7 +564,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.150 2007-05-24 17:35:17 steve Exp $
+ $Id: xen-create-image,v 1.151 2007-06-02 11:48:18 radu Exp $
 
 =cut
 
@@ -1239,7 +1239,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.150 $';
+        my $REVISION      = '$Revision: 1.151 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..603a13a
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,35 @@
+README
+======
+
+Kernel/initrd guessing
+======================
+
+In xen-tools 3.4-1 a new feature was added which allows using backtick expressions 
+in xen-tools.conf.
+
+Using this feature you can improve kernel/initrd guessing by changing/adding the following options
+to xen-tools.conf:
+
+   kernel      = /boot/vmlinuz-`uname -r`
+   ramdisk     = /boot/initrd.img-`uname -r`
+
+
+Upgrading Existing kernel/initrd paths
+--------------------------------------
+
+The kernel, and initrd, settings which are included in the xen-tools
+(either statically or dynamically with `uname -r`) are only applied
+when the new guest domains are created.
+
+If you upgrade your kernel you will be left with existing xen
+guest domains which :
+
+  -  Have the wrong paths setup in /etc/xen/*.cfg
+  -  Have incorrect modules stored within their disk images.
+
+Both of these can be updated via the helper scripts located
+in:
+
+   /usr/share/doc/xen-tools/examples/
+
+
diff --git a/debian/changelog b/debian/changelog
index e411ddb..06a8c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-xen-tools (3.4-1) stable; urgency=low
+xen-tools (3.4-1) unstable; urgency=low
 
+  [ Steve Kemp ]
   * New upstream release v3.4
     - Allows the expansion of backticks in configuration file(s).
     - Generate locales for the new Xen guests to match the host machine.
       (Closes: #423385)
-	
- -- Steve Kemp <steve@steve.org.uk>  Thu, 24 May 18:34:14 +0000
+
+  [ Radu Spineanu ]
+    - Better kernel/initrd guessing in the configuration file(using uname -r).
+      Also added a note about this in README.Debian. (closes: #425019)
+
+ -- Radu Spineanu <radu@debian.org>  Tue, 29 May 2007 01:09:40 +0300
 
 xen-tools (3.3-1) unstable; urgency=low
 
@@ -14,7 +19,7 @@ xen-tools (3.3-1) unstable; urgency=low
     - Refuse to delete running guests.  (Closes: #419561)
     - Updated the package "Recommends" (Closes: #421174)
 
- -- Steve Kemp <skx@debian.org>  Fri, 11 May 17:30:09 +0000
+ -- Radu Spineanu <radu@debian.org>  Fri, 12 May 2007 19:09:09 +0200
 
 xen-tools (3.2-1) unstable; urgency=low
 
diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf
index b524440..514651a 100644
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@ -164,8 +164,8 @@ image  = sparse   # Specify sparse vs. full disk images.
 #
 # Default kernel and ramdisk to use for the virtual servers
 #
-kernel = /boot/vmlinuz-2.6.16-2-xen-686
-initrd = /boot/initrd.img-2.6.16-2-xen-686
+kernel      = /boot/vmlinuz-`uname -r`
+initrd      = /boot/initrd.img-`uname -r`
 
 #
 #  The architecture to use when using debootstrap or rpmstrap.