diff --git a/KNOWN_BUGS b/KNOWN_BUGS
new file mode 100644
index 0000000..4a74830
--- /dev/null
+++ b/KNOWN_BUGS
@@ -0,0 +1,13 @@
+KNOWN BUGS in xen-tools
+
+Bugs to fix before a 4.2 release
+--------------------------------
+
+* xen-delete-image doesn't remove all logical volumes if --partitions is used.
+
+   See the link below for details how to reproduce. Reproducable at
+   least with --lvm. Thanks to Antoine Benkemoun for reporting.
+
+   http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
+
+* xen-delete-image ignores extension setting
diff --git a/TODO b/TODO
index b1a3bba..4990b23 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,10 @@
 TODO
 ====
 
-Bugs to fix and Features to add before a 4.2 release
-----------------------------------------------------
+See KNOWN_BUGS for real bugs.
+
+Minor bugs to fix and features to add before a 4.2 release
+----------------------------------------------------------
 
 * xen-create-image man page overhaul:
 
@@ -22,22 +24,12 @@ Bugs to fix and Features to add before a 4.2 release
    in the domU, it's key fingerprint should be echo'd in a way that
    can easily be grep'ed into other scripts.
 
-
 * Test and support more file system types.
 
    Actually this should be pretty simple now that the parameters are
    stored in the configuration hash.  The only issue is that trailing
    whitespace is missing from the "make_fs_foo" option.
 
-* xen-delete-image doesn't remove all logical volumes if --partitions is used.
-
-   See the link below for details how to reproduce. Reproducable at
-   least with --lvm. Thanks to Antoine Benkemoun for reporting.
-
-   http://xen-tools.org/pipermail/xen-tools-discuss/2010-May/000757.html
-
-* xen-delete-image ignores extension setting
-
 * xen-create-image should check all integer options on non-digits.
 
 * Test suite should pass
diff --git a/debian/changelog b/debian/changelog
index 5c32fa5..33750f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
     - Checks for debootstrap and cdebootstrap, uses debootstrap if both
       are installed (Changed "Depends: debootstrap" to "Depends:
       debootstrap | cdebootstrap" in debian/control)
+    - Added new files TODO and KNOWN_BUGS to debian/docs.
   * Removal of /etc/bash_completion.d/xm from the package since
     bash-completion ships a more elaborate version of that file. (Closes:
     #566683, #550590, LP: #538917, #484098)
diff --git a/debian/docs b/debian/docs
index a063bdb..7944ff4 100644
--- a/debian/docs
+++ b/debian/docs
@@ -2,4 +2,5 @@ AUTHORS
 README
 SUPPORT
 BUGS
-TODO
\ No newline at end of file
+TODO
+KNOWN_BUGS