diff --git a/ChangeLog b/ChangeLog
index 30fa7c3e..51fb5064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+Changes in version 2.0.16-stable (?? Nov 2011)
+BUGFIXES (Libevent core):
+ o epoll: close fd on alloc fail at initialization (1aee718 Jamie Iles)
+ o Fix compile warning from saying event2/*.h inside a comment (447b0ba)
+ o Avoid potential SSL read spinlocks (fc52dba Mark Ellzey)
+ o openssl bufferevent has the same issue with writing as prior commit. (7353663 Mark Ellzey)
+ o Warn when unable to construct base because of failing make_base_notifiable (4e797f3)
+ o Don't try to make notifiable event_base when no threading fns are configured (e787413)
+
+BUGFIXES (evbuffers and buffervents):
+ o Fix an evbuffer crash in evbuffer_remove_buffer() (c37069c)
+
+BUGFIXES (DNS):
+ o Empty DNS reply with OK status is another way to say NODATA. (21a08d6 Leonid Evdokimov)
+
+CLEANUPS:
+ o Style and comment tweaks for dns/leak* tests (5e42202)
+ o Update copyright dates to 2011. (3c824bd)
+
+DEBUGGING SUPPORT:
+ o More detailed message in case of libevent self-debugging failure. (9e6a4ef Leonid Evdokimov)
+
+TESTING:
+ o Tests for 94fba5b and f72e8f6 (d58c15e Leonid Evdokimov)
+ o Test for commit aff6ba1 (f7841bf Leonid Evdokimov)
+ o unit test for remove_buffer bug (90bd620 Greg Hazel)
+ o improve test to remove at least one buffer from src (7eb52eb Greg Hazel)
+ o Fix DNS memleak checks when running with malloc-replacement/debugging disabled (b17b0ee)
+
+DOCUMENTATION AND SAMPLE CODE:
+ o Add note about evhttp_send_reply_end to its doxygen (724bfb5)
+ o Fix typo in whatsnew-2.0.txt (674bc6a Mansour Moufid)
+ o Improve win32 behavior of dns-sample.c codex (a3f320e Gisle Vanem)
+
+
+
 Changes in version 2.0.15-stable (12 Oct 2011)
 BUGFIXES (DNS):
  o DNS: add ttl for negative answers using RFC 2308 idea. (f72e8f6 Leonid Evdokimov)
diff --git a/README b/README
index 9170cb03..cd224f30 100644
--- a/README
+++ b/README
@@ -107,6 +107,7 @@ fixing bugs:
   Sebastian Hahn
   Aaron Hopkins
   Tani Hosokawa
+  Jamie Iles
   Claudio Jeker
   Evan Jones
   George Kadianakis
@@ -161,6 +162,7 @@ fixing bugs:
   Dongsheng Song
   Brodie Thiesfield
   Jason Toffaletti
+  Gisle Vanem
   Bas Verhoeven
   Constantine Verutin
   Zack Weinberg
diff --git a/test/regress_dns.c b/test/regress_dns.c
index e4cfd520..33be7501 100644
--- a/test/regress_dns.c
+++ b/test/regress_dns.c
@@ -1637,6 +1637,7 @@ gaic_launch(struct event_base *base, struct evdns_base *dns_base)
 	++pending;
 }
 
+#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
 /* FIXME: We should move this to regress_main.c if anything else needs it.*/
 
 /* Trivial replacements for malloc/free/realloc to check for memory leaks.
@@ -1698,8 +1699,12 @@ testleak_cleanup(const struct testcase_t *testcase, void *env_)
 {
 	int ok = 0;
 	struct testleak_env_t *env = env_;
+#ifdef _EVENT_DISABLE_DEBUG_MODE
+	tt_int_op(allocated_chunks, ==, 0);
+#else
 	/* FIXME: that's `1' because of event_debug_map_HT_GROW */
 	tt_int_op(allocated_chunks, ==, 1);
+#endif
 	ok = 1;
 end:
 	if (env->dns_base)
@@ -1754,6 +1759,7 @@ test_dbg_leak_shutdown(void *env_)
 	event_base_free(env->base);
 	env->base = 0;
 }
+#endif
 
 static void
 test_getaddrinfo_async_cancel_stress(void *ptr)
@@ -1832,8 +1838,10 @@ struct testcase_t dns_testcases[] = {
 	{ "getaddrinfo_cancel_stress", test_getaddrinfo_async_cancel_stress,
 	  TT_FORK, NULL, NULL },
 
+#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
 	{ "leak_shutdown", test_dbg_leak_shutdown, TT_FORK, &testleak_funcs, NULL },
 	{ "leak_cancel", test_dbg_leak_cancel, TT_FORK, &testleak_funcs, NULL },
+#endif
 
 	END_OF_TESTCASES
 };