diff --git a/CMakeLists.txt b/CMakeLists.txt
index 803c49c9..3a774713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
diff --git a/changelog b/changelog
index e9132c5d..92271e66 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,9 @@
 Changelog
 ---------
 
+v2.0.1
+======
+
 Fixes
 -----
 
@@ -29,6 +32,27 @@ Fixes
 5) Allow per-vhost setting of which protocol should get used
 when the protocol: header is not sent by the client
 
+6) MINOR: user_space arg was mistakenly NULL on
+LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER
+
+7) MINOR: treating recv() returning 0 as peer close destroyed throughput on ab
+tests, reverted
+
+8) MINOR: %3d on URL part was always turned to _... this should only happen in
+?na%3dme=x part of the URL
+
+9) MINOR: some malloc escaped check for NULL / OOM
+
+10) MINOR: libuv cleanups and client connections can operate correctly with
+libuv
+
+11) MINOR: POST used to hang up the connection when the body had all arrived.
+Change it so you can reply with a 200 directly rather than requiring a
+redirect
+
+12) MINOR: API docs were a little behind the docs in the code
+
+
 
 v2.0.0
 ======
diff --git a/libwebsockets.spec b/libwebsockets.spec
index 355caa53..7f710223 100644
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@@ -1,5 +1,5 @@
 Name: libwebsockets
-Version: 2.0.0
+Version: 2.0.1
 Release: 1%{?dist}
 Summary: Websocket Server and Client Library
 
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 /%{_libdir}/pkgconfig/libwebsockets.pc
 
 %changelog
+* Thu May 12 2016 Andy Green <andy@warmcat.com> 2.0.1-1
+- MINOR Upstream 2.0.1 release
+
 * Thu May 05 2016 Andy Green <andy@warmcat.com> 2.0.0-1
 - MAJOR SONAMEBUMP APICHANGES Upstream 2.0.0 release