diff --git a/NEWS b/NEWS
index 65679ebb..799fd9ac 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,14 @@ Command-Line Interface
 
   The old format is still available with `--format=sup`.
 
+Emacs Interface
+---------------
+
+Bug fix for saved searches with newlines in them.
+
+  Split lines confuse `notmuch count --batch`, so we remove embedded
+  newlines before calling notmuch count.
+
 Notmuch 0.17 (2013-12-30)
 =========================
 
diff --git a/debian/changelog b/debian/changelog
index a419ace1..37bb0f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.18-1) unstable; urgency=medium
+
+  * Bug fix: "insufficient sanitization of arguments to notmuch CLI",
+    thanks to Antoine Beaupré (Closes: #737496).
+
+ -- David Bremner <bremner@debian.org>  Mon, 03 Mar 2014 08:23:03 -0400
+
 notmuch (0.17-5) unstable; urgency=medium
 
   * Bug fix: "unowned directory after purge: /0755/", thanks to