diff --git a/NEWS b/NEWS
index 8f9e36a1..5d313da1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-v0.8.17-head 2014-XX-XX  The Irssi team <staff@irssi.org>
+v0.8.18-head 2014-XX-YY  The Irssi team <staff@irssi.org>
+
+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.
 	+ Synchronize scripts with scripts.irssi.org.
 	+ Performance enhancement of the nicklist as well as the window_item_find function. See Github PR #24.
@@ -19,6 +21,7 @@ v0.8.17-head 2014-XX-XX  The Irssi team <staff@irssi.org>
 	- Fixed gui_printtext_after and term_refresh_*() visibility. See Github PR #22.
 	- Fixed issue where UTF-8 characters was corrupted once for every 32k text. See Github PR #12.
 	- Fixed redrawing issue with right-aligned statusbar.
+	- Fixed use-after-free bug with cached settings values. See Github PR #147.
 
 v0.8.16 2014-05-28  The Irssi team <staff@irssi.org>
 	+ Add -noautosendcmd to /SERVER and /CONNECT. Passing this option will
diff --git a/configure.ac b/configure.ac
index 2a7bee0d..477f8c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(irssi, 0.8.17-head)
+AC_INIT(irssi, 0.8.18-head)
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_PREREQ(2.50)
diff --git a/src/core/servers.c b/src/core/servers.c
index 06f82d4d..6eaad191 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -218,9 +218,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 		return;
 
 	if (ip != NULL) {
-		own_ip = ip == NULL ? NULL :
-			(IPADDR_IS_V6(ip) ? server->connrec->own_ip6 :
-			 server->connrec->own_ip4);
+		own_ip = IPADDR_IS_V6(ip) ? server->connrec->own_ip6 : server->connrec->own_ip4;
 		port = server->connrec->proxy != NULL ?
 			server->connrec->proxy_port : server->connrec->port;
 		handle = server->connrec->use_ssl ?