diff --git a/lib/server.js b/lib/server.js
index 37c4c99..ae66366 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -47,7 +47,10 @@ function Server(options, isSecure, onListening) {
           else {
             xml = Serializer.serializeMethodResponse(value)
           }
-          response.writeHead(200, {'Content-Type': 'text/xml'})
+          response.writeHead(200, {
+            'Content-Type': 'text/xml'
+          , 'Content-Length': Buffer.byteLength(xml, 'utf8')
+          })
           response.end(xml)
         })
       }
diff --git a/test/server_test.js b/test/server_test.js
index 07f2f65..1fcd845 100644
--- a/test/server_test.js
+++ b/test/server_test.js
@@ -103,6 +103,27 @@ vows.describe('Server').addBatch({
       }
     }
   }
+, 'A response': {
+    topic: function () {
+      var that = this
+
+      var server = new Server({ port: 9994, path: '/' })
+      server.on('testMethod', function (err, par, cb) { cb(null) })
+
+      setTimeout(function () {
+        var client = new Client({ host: 'localhost', port: 9994 })
+        client.headersProcessors.processors.push({
+          composeRequest: function () { }
+        , parseResponse: function (headers) { that.callback(null, headers) }
+        })
+        client.methodCall('testMethod', null, function () { })
+      }, 500)
+    }
+  , 'contains a content-length': function (headers) {
+      assert.isTrue(headers.hasOwnProperty('content-length'))
+      assert.isTrue(headers['content-length'] > 0)
+    }
+  }
 , 'close()': {
   topic: function() {
     console.log()