diff --git a/AUTHORS b/AUTHORS
index dc8e578c..7ded5017 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,7 +77,7 @@ Other patches (grep for "patch" in ChangeLog) by:
   Jon Mayo
   Johan Kiviniemi
   JasonX
-  Lukas Mai
+  Lukas Mai (mauke)
   Ismael Luceno
   Thomas Karpiniec
   Svante Kvarnström
@@ -95,6 +95,5 @@ Other patches (grep for "patch" in ChangeLog) by:
   Adam-
   Robert C Jensen
   Paul Johnson
-  mauke
   KindOne
   Fabian Kurz
diff --git a/INSTALL b/INSTALL
index 234c6cf6..a83a6c76 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,8 +11,7 @@ To compile irssi you need:
 
 For most people, this should work just fine:
 
- ./autogen.sh     (for people who just cloned the repository)
- ./configure      (if this script already exists, skip ./autogen.sh)
+ ./configure
  make
  su
  make install     (not _really_ required except for perl support)
diff --git a/NEWS b/NEWS
index 8db80f80..405e8b4c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,8 @@
-v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
+v0.8.18-beta2 2016-01-13  The Irssi team <staff@irssi.org>
+	* Modules will now require to define a
+	      void MODULENAME ## _abicheck(int *version)
+	  method to ensure that they are compiled against the correct Irssi
+	  version.
 	* The signature of "message private" has been changed to
 	      5: server, message, nick, address, target
 	  in order to support "self messages". Module authors should
@@ -22,6 +26,7 @@ v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	+ The config parser is more robust and prints out better diagnostics on
 	  incorrect config files.
 	+ Ctrl+^ (FS#721) and Ctrl+J can now be bound.
+	+ Command history can be cleared with /window history -clear
 	+ /hilight -mask -line is now supported (FS#275).
 	+ CHANTYPES are now supported.
 	+ Improved reload speed of ignores.
@@ -32,6 +37,7 @@ v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	+ Disable SSLv3 due to the POODLE vulnerability.
 	+ SSL ciphers can now be specified per server.
 	+ Added SNI support for SSL.
+	- /ignore now respects -pattern on merge (#78).
 	- irssiproxy (BNC) module now uses correct line endings.
 	- Fix missing lines on large pastes (FS#905).
 	- Correctly preserve STATUSMSG prefixes (#291).
diff --git a/configure.ac b/configure.ac
index c0efd5e3..bf39c95f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.18-head)
+AC_INIT(irssi, 0.8.18-beta2)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)