diff --git a/ChangeLog b/ChangeLog
index f4a4a07f..13cbae6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,4 @@
-Changes in version 2.0.17-stable (?? Feb 2012)
-
- {LAST UPDATED AS OF 5b4b8126de52c8a895094cfea61724a91e179e71}
+Changes in version 2.0.17-stable (10 Feb 2012)
 
 BUGFIXES (core):
  o Be absolutely sure to clear pncalls before leaving event_signal_closure (11f36a5)
@@ -11,6 +9,8 @@ BUGFIXES (core):
  o Fix a fd leak in event_reinit() (3f18ad1)
  o Do a memberwise comparison of threading function tables (c94a5f2 Nate R)
  o Use C-style comments in C source files (for compatibility with compilers such as xlc on AIX). (d84d917 Greg Hewgill)
+ o Avoid crash when freeing event_iocp and using event_set_mem_functions (19715a6
+ o In the kqueue backend, do not report EBADF as an EV_READ (5d7bfa1 Nicholas Marriott)
 
 BUGFIXES (evbuffer and bufferevents):
  o Fix behavior of evbuffer_peek(buf,-1,NULL,NULL,0) (c986f23 Zack Weinberg)
@@ -28,6 +28,7 @@ BUILD FIXES:
 
 DOCUMENTATION FIXES:
  o Slightly clarify evbuffer_peek documentation (7bbf6ca)
+ o Update copyright notices to 2012 (e49e289)
 
 NEW APIS:
  o Backport evhttp_connection_get_bufferevent to Libevent 2.0 (da70fa7 Arno Bakker)
diff --git a/README b/README
index cd224f30..3423900d 100644
--- a/README
+++ b/README
@@ -71,6 +71,8 @@ use and development: http://archives.seul.org/libevent/users/
 The following people have helped with suggestions, ideas, code or
 fixing bugs:
 
+  Arno Bakker
+  Maseeb Abdul
   Alejo
   Weston Andros Adamson
   William Ahern
@@ -99,12 +101,16 @@ fixing bugs:
   Shie Erlich
   Leonid Evdokimov
   Christophe Fillot
+  Mike Frysinger
+  Remi Gacogne
   Alexander von Gernler
   Artur Grabowski
   Dave Hart
   Greg Hazel
   Michael Herf
   Sebastian Hahn
+  Mark Heily
+  Greg Hewgill
   Aaron Hopkins
   Tani Hosokawa
   Jamie Iles
@@ -143,28 +149,33 @@ fixing bugs:
   Phil Oleson
   Dave Pacheco
   Tassilo von Parseval
+  Catalin Patulea
   Simon Perreault
   Pierre Phaneuf
   Ryan Phillips
   Dimitre Piskyulev
   Pavel Plesov
   Jon Poland
+  Nate R
   Robert Ransom
   Bert JW Regeer
   Peter Rosin
+  Wang Qin
   Hanna Schroeter
   Ralf Schmitt
   Mike Smellie
   Kevin Springborn
   Harlan Stenn
-  Ferenc Szalai
+  Steve Snyder
   Dug Song
   Dongsheng Song
+  Ferenc Szalai
   Brodie Thiesfield
   Jason Toffaletti
   Gisle Vanem
   Bas Verhoeven
   Constantine Verutin
+  Colin Watt
   Zack Weinberg
   Jardel Weyrich
   Alex