diff --git a/lib/http.js b/lib/http.js
index 85b055b460..ef2f10255f 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -392,14 +392,13 @@ OutgoingMessage.prototype.write = function (chunk, encoding) {
 
   encoding = encoding || "ascii";
   if (this.chunkedEncoding) {
-    if (typeof chunk == 'string') {
-      this._send(process._byteLength(chunk, encoding).toString(16));
-    } else {
-      this._send(chunk.length.toString(16));
+    var chunkLength = (typeof chunk == 'string' ? process._byteLength(chunk, encoding) : chunk.length);
+    if (chunkLength > 0) {
+        this._send(chunkLength.toString(16));
+        this._send(CRLF);
+        this._send(chunk, encoding);
+        this._send(CRLF);
     }
-    this._send(CRLF);
-    this._send(chunk, encoding);
-    this._send(CRLF);
   } else {
     this._send(chunk, encoding);
   }
diff --git a/test/simple/test-http-write-empty-string.js b/test/simple/test-http-write-empty-string.js
new file mode 100644
index 0000000000..8a743c66e7
--- /dev/null
+++ b/test/simple/test-http-write-empty-string.js
@@ -0,0 +1,40 @@
+PORT = 8000;
+sys = require('sys');
+http = require('http');
+assert = require('assert');
+
+server = http.createServer(function (request, response) {
+  sys.puts('responding to ' + request.url);
+
+  response.writeHead(200, {'Content-Type': 'text/plain'});
+  response.write('1\n');
+  response.write('');
+  response.write('2\n');
+  response.write('');
+  response.end('3\n');
+
+  this.close();
+})
+server.listen(PORT);
+
+var response="";
+
+process.addListener('exit', function () {
+  assert.equal('1\n2\n3\n', response);
+});
+
+
+server.addListener('listening', function () {
+  var client = http.createClient(PORT);
+  var req = client.request("/");
+  req.end();
+  req.addListener('response', function (res) {
+    assert.equal(200, res.statusCode);
+    res.setEncoding("ascii");
+    res.addListener('data', function (chunk) {
+      response += chunk;
+    });
+    sys.error("Got /hello response");
+  });
+});
+