diff --git a/ChangeLog b/ChangeLog
index 5839113c9..04452a9a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,9 @@ release 0.14.6
 	* fixed download piece performance bug in piece picker
 	* fixed bug in connect candidate counter
 	* replaces invalid filename characters with .
+	* added --with-libgeoip option to configure script to allow building and
+	  linking against system wide library
+	* fixed potential pure virtual function call in extensions on shutdown
 
 release 0.14.5
 
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index d5050d127..b5a77cc10 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -679,6 +679,10 @@ namespace libtorrent
 
 		m_disk_recv_buffer_size = 0;
 
+#ifndef TORRENT_DISABLE_EXTENSIONS
+		m_extensions.clear();
+#endif
+
 #if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_ERROR_LOGGING
 		if (m_logger)
 		{