diff --git a/AUTHORS b/AUTHORS
index fcd0c1fe3da..7b8069e522d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -350,3 +350,4 @@ Ivan Torres <mexpolk@gmail.com>
 Philipp Hagemeister <phihag@phihag.de>
 George Shank <shankga@gmail.com>
 Mike Morearty <mike@morearty.com>
+Peter Rybin <peter.rybin@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 48633a76916..50269ce671c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2012.07.19, Version 0.8.3 (Stable)
+2012.07.25, Version 0.8.4 (Stable)
+
+* V8: Upgrade to 3.11.10.17
+
+* npm: Upgrade to 1.1.45
+
+* net: fix Socket({ fd: 42 }) api (Ben Noordhuis)
+
+* readline: Remove event listeners on close (isaacs)
+
+* windows: correctly prep long path for fs.exists(Sync) (Bert Belder)
+
+* debugger: wake up the event loop when a debugger command is dispatched (Peter Rybin)
+
+* tls: verify server's identity (Fedor Indutny)
+
+* net: ignore socket.setTimeout(Infinity or NaN) (Fedor Indutny)
+
+
+2012.07.19, Version 0.8.3 (Stable), 60bf2d6cb33e4ce55604f73889ab840a9de8bdab
 
 * V8: upgrade to 3.11.10.15
 
diff --git a/Makefile b/Makefile
index aa24fe10156..15546d06d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -266,6 +266,9 @@ bench-idle:
 	sleep 1
 	./node benchmark/idle_clients.js &
 
+jslintfix:
+	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/fixjsstyle.py --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
+
 jslint:
 	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
 
diff --git a/lib/net.js b/lib/net.js
index 7fe892f65dc..170c06e57a6 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -132,12 +132,12 @@ function Socket(options) {
   Stream.call(this);
 
   switch (typeof options) {
-  case 'number':
-    options = { fd: options }; // Legacy interface.
-    break;
-  case 'undefined':
-    options = {};
-    break;
+    case 'number':
+      options = { fd: options }; // Legacy interface.
+      break;
+    case 'undefined':
+      options = {};
+      break;
   }
 
   if (typeof options.fd === 'undefined') {
diff --git a/src/node_version.h b/src/node_version.h
index c8e8264d0b4..af2936a65de 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -25,7 +25,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 8
 #define NODE_PATCH_VERSION 4
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)