diff --git a/CHANGES.txt b/CHANGES.txt
index fa88628a..76a5c55e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
 Changes
 =======
 
+0.6.0 - Feb 18, 2014
+--------------------
+
+* **NOTE** : 0.6.0 will break existing code that sub-classes WebsocketProxy
+* Refactor to use standard SocketServer RequestHandler design
+* Fix zombie process bug on certain systems when using multiprocessing
+* Add better unit tests
+* Log information via python `logging` module
+
 0.5.1 - Jun 27, 2013
 --------------------
 
diff --git a/other/js/package.json b/other/js/package.json
index ab6d4789..c1422b8a 100644
--- a/other/js/package.json
+++ b/other/js/package.json
@@ -3,7 +3,7 @@
   "name": "websockify",
   "description": "websockify is a WebSocket-to-TCP proxy/bridge",
   "license": "LGPL-3",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/kanaka/websockify.git"
diff --git a/setup.py b/setup.py
index d0e2c31f..0ea9cce3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.5.1'
+version = '0.6.0'
 name = 'websockify'
 long_description = open("README.md").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"