diff --git a/configure.ac b/configure.ac
index c76c727..2a2bdb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is one of the locations where the authoritative version
 dnl  number is stored.  The other is in the debian/changelog.
-AC_INIT(shellinabox, 2.19, markus@shellinabox.com)
+AC_INIT(shellinabox, 2.18, markus@shellinabox.com)
 if test -e .git; then
 VCS_REVISION=" (revision `cd $srcdir && git log -1 --format=format:%h`)"
 else
diff --git a/debian/changelog b/debian/changelog
index 535891b..6fc56d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-shellinabox (2.18) UNRELEASED; urgency=low
+shellinabox (2.18) unstable; urgency=low
 
-  * Non-maintainer release
+  * Fixed reverse vide rendering, #341.
+  * Using stdout for version information, #344.
+  * Added CGI session key in HTTP response.
+  * Child process cleanup, #103.
+  * Merged #340.
+  * Autoconf updates.
+  * Disabled utmp logging.
+  * Merge #338, killing children with HUP.
+  * Fixed handling of large HTTP requests.
+  * Enhanced logging clarity with prefix.
 
- -- Luka Krajger <luka.krajger@gmail.com>  Thu, 17 Sep 2015 10:26:05 +0200
+ -- Marc Singer <elf@debian.org>  Sat, 10 Oct 2015 10:53:38 -0700
 
 shellinabox (2.17) unstable; urgency=medium