diff --git a/AUTHORS b/AUTHORS
index d2cb58c0..dc8e578c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,8 @@ Irssi staff (current maintainers) <staff@irssi.org>:
   Jilles Tjoelker (jilles)
   Alexander Færøy (ahf)
   Jase Thew (bazerka)
+  dequis (dx)
+  Ailin Nemui (Nei)
 
 Former developers:
 
@@ -24,6 +26,7 @@ Large feature patches by:
   Heikki Orsila : DCC SEND queueing
   Mark Trumbull : DCC SERVER
   Francesco Fracassi : Passive DCC
+  Giuseppe (The Lemon Man)
 
 Other patches (grep for "patch" in ChangeLog) by:
 
@@ -78,6 +81,20 @@ Other patches (grep for "patch" in ChangeLog) by:
   Ismael Luceno
   Thomas Karpiniec
   Svante Kvarnström
-  Ailin Nemui (Nei)
   Tom Feist (shabble)
-  Sebastian Thorarensen
+  Sebastian Thorarensen (Sebban)
+  Hans Nielsen
+  Jari Matilainen (vague)
+  Thibault B (isundil)
+  kyak
+  Vesa Pirila (Lohhari)
+  Haw Loeung
+  François Revol (mmuman)
+  blha303
+  Guillaume Brogi (guiniol)
+  Adam-
+  Robert C Jensen
+  Paul Johnson
+  mauke
+  KindOne
+  Fabian Kurz
diff --git a/NEWS b/NEWS
index 511f495a..8db80f80 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,52 @@
-v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
-	+ Garbage Collection support has been removed. This will hardly have any
+v0.8.18-head 2016-xx-xx  The Irssi team <staff@irssi.org>
+	* The signature of "message private" has been changed to
+	      5: server, message, nick, address, target
+	  in order to support "self messages". Module authors should
+	  implement this change if they are using this signal.
+	* Removing networks will now remove all attached servers and channels
+          (#45).
+	* The proxy module now has an /irssiproxy command.
+	* sb_search has been moved to scripts.irssi.org
+	* WIN32 has been completely removed (it had not been working and is
+          lacking a maintainer.)
+	* Garbage Collection support has been removed. This will hardly have any
 	  effect for anyone given that it has been unsupported for several years.
-	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ CAP SASL PLAIN login is now supported natively.
+	+ Paste bracket markers can be requested from terminal with
+	      /set paste_use_bracketed_mode on
+	+ "Self messages" generated by some bouncers can now be received in the
+	  proper window.
 	+ Try to split long lines on spaces to avoid words being splitted. Adds
 	  a new option: 'split_line_on_space' which defaults to on.
+	+ Add setting hilight_nick_matches_everywhere (#56).
+	+ 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.
+	+ /hilight -mask -line is now supported (FS#275).
+	+ CHANTYPES are now supported.
+	+ Improved reload speed of ignores.
+	+ Add -date feature to /lastlog
+	+ irssiproxy can be more easily enabled and disabled.
+	+ Expando for hostname (FS#829).
+	+ UNIX sockets can now also be specified in the config file.
+	+ Disable SSLv3 due to the POODLE vulnerability.
+	+ SSL ciphers can now be specified per server.
+	+ Added SNI support for SSL.
+	- irssiproxy (BNC) module now uses correct line endings.
+	- Fix missing lines on large pastes (FS#905).
+	- Correctly preserve STATUSMSG prefixes (#291).
+	- Fix infinite recursion in key bindings (FS#817).
+	- Fix incomplete awaylog caused by buffering.
+	- Fix calculation of UTF-8 string length display in some cases.
+	- Fix some Perl warnings related to @ISA.
+	- EXEC windowitems now get proper references on the Perl side.
+	- Incremental help file improvements.
+	- ANSI attributes are now properly reset.
+	- Fixed regression where text would blink when terminal lacks color
+          support.
+	- Permit the usage of Freenode extban syntax in /ban (#150)
+	- Fixed regression in scriptassist on unload of scripts.
+	- Fixed regression in -actcolor %n
 
 v0.8.17 2014-10-11  The Irssi team <staff@irssi.org>
 	+ Document that SSL connections aren't properly handled during /UPGRADE. See Github PR #39.