diff --git a/KNOWN_BUGS b/KNOWN_BUGS
index 1f91804..449220f 100644
--- a/KNOWN_BUGS
+++ b/KNOWN_BUGS
@@ -26,3 +26,5 @@ Bugs to fix before a 4.3 release
   Current (unreleased) fix is to sort by mountpoint length.
 
   Fix would be to reproduce what mount does with mount -a.
+
+* xen-create-image doesn't unmount the tempdir properly if /proc wasn't mounted inside
diff --git a/Makefile b/Makefile
index 9c9284e..a8abc20 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d lucid.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 
diff --git a/debian/changelog b/debian/changelog
index b35b050..49e9fbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low
   * New upstream snapshot
     - Correctly checks and documents valid values for
       disk_device. (Closes: #621499)
+  * Support creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
+  * Fix Lintian warning copyright-refers-to-symlink-license.
 
- -- Axel Beckert <abe@debian.org>  Tue, 19 Apr 2011 23:19:35 +0200
+ -- Axel Beckert <abe@debian.org>  Tue, 13 Sep 2011 15:50:59 +0200
 
 xen-tools (4.2.1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 108737f..6efadb7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,5 +23,5 @@ Perl is distributed under licenses:
     b) the "Artistic License" which comes with Perl.
 
     On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in /usr/share/common-licenses/GPL' and
+    Public License can be found in /usr/share/common-licenses/GPL-1' and
     the Artistic Licence in /usr/share/common-licenses/Artistic'.