diff --git a/debian/README.notmuch-emacs b/debian/README.notmuch-emacs
new file mode 100644
index 00000000..713523b4
--- /dev/null
+++ b/debian/README.notmuch-emacs
@@ -0,0 +1,8 @@
+
+* This package currently works only with emacs 23.  Users of 
+  pre-release snapshots of emacs 24 can expect problems.
+
+* For help in getting started with notmuch and the emacs interface,
+  see /usr/share/doc/notmuch/README.
+
+ -- David Bremner <bremner@debian.org>, Fri,  1 Jul 2011 11:41:26 -0300
diff --git a/debian/README.notmuch-vim b/debian/README.notmuch-vim
index f07b4991..ec052eef 100644
--- a/debian/README.notmuch-vim
+++ b/debian/README.notmuch-vim
@@ -3,4 +3,6 @@ notmuch for Debian
 
 To use the vim plugin, please install it using vim-addons(1)
 
- -- martin f. krafft <madduck@debian.org>  Thu, 21 Jan 2010 14:50:19 +1300
+See also /usr/share/doc/notmuch/README.
+
+ -- David Bremner <bremner@debian.org>, Fri,  1 Jul 2011 11:34:39 -0300
diff --git a/debian/changelog b/debian/changelog
index bfb1d60c..0fad868a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+notmuch (0.6) unstable; urgency=low
+
+  * New upstream release; see /usr/share/doc/notmuch/NEWS for
+    details. Hilights include:
+    - Folder-based search (Closes: #597222)
+    - PGP/MIME decryption and verification
+  * Document strict dependency on emacs23 (Closes: #631994).
+
+ -- David Bremner <bremner@debian.org>  Fri, 01 Jul 2011 11:45:22 -0300
+
 notmuch (0.6~rc1) experimental; urgency=low
 
   * Git snapshot 3f777b2
diff --git a/debian/notmuch.docs b/debian/notmuch.docs
new file mode 100644
index 00000000..50bd824b
--- /dev/null
+++ b/debian/notmuch.docs
@@ -0,0 +1,2 @@
+NEWS
+README