diff --git a/AUTHORS b/AUTHORS
index 7ded5017..eea359cc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,3 +97,5 @@ Other patches (grep for "patch" in ChangeLog) by:
   Paul Johnson
   KindOne
   Fabian Kurz
+  Todd Pratt
+  xavierog
diff --git a/NEWS b/NEWS
index 0d450b02..5312aef5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,28 @@
 v0.8.20-head 2016-xx-xx  The Irssi team <staff@irssi.org>
 	* Removed --disable-ipv6
+	* /connect Network now aborts with an error if no servers have been
+	  added to that network.
+	* /dcc commands now use quotes around spaces consistently.
 	+ irssiproxy can now forward all tags through a single port.
+	+ irssiproxy can also listen on unix sockets.
 	+ send channel -botcmds immediately when no mask is specified (#175).
+	+ the kill buffer now remembers consecutive kills.
+	  New bindings were added: yank_next_cutbuffer and append_next_kill
+	+ connections will avoid looking up IPv6 addresses if the machine does
+	  not have an IPv6 address assigned (exact behaviour is implementation
+	  defined).
+	+ Fix potential crash if scripts insert undef values into the completion
+	  list.
+	+ Paste warning is now also shown on pasting overlong lines.
+	+ autolog_ignore_targets and activity_hide_targets learn a new syntax
+	      tag/* and * to ignore whole networks or everything.
+	+ /hilight got a -matchcase flag to hilight case sensitively (#421).
+	- /squery and /servlist commands have been restored.
+	- Where Irssi would previously only report "System error" on connect,
+	  it will now try harder to retrieve the system error message.
+	- IP addresses are no longer stored when resolve_reverse_lookup is
+	  used.
+	- /names and $[...] now uses utf8 string operations (#40, #411).
 
 v0.8.19 2016-03-23  The Irssi team <staff@irssi.org>
 	- Fixed regression when joining and parting channels on IRCnet (#435)
diff --git a/src/common.h b/src/common.h
index 4fd6d331..66892b78 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 4
+#define IRSSI_ABI_VERSION 5
 
 #define DEFAULT_SERVER_ADD_PORT 6667