diff --git a/ChangeLog b/ChangeLog
index 60e497f46..17fb999e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/GSHTTPURLHandle.m: Set content-length header in outgoing
+        request if not already set.
+
 2012-11-25 14:39-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Headers/Foundation/NSMetadata.h
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 0dd5a176a..e7a275316 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -404,11 +404,16 @@ debugWrite(GSHTTPURLHandle *handle, NSData *data)
 	}
     }
 
-  if ([wData length] > 0)
+  /* Ensure we set the correct content length (may be zero)
+   */
+  if ((id)NSMapGet(wProperties, (void*)@"Content-Length") == nil)
     {
       NSMapInsert(wProperties, (void*)@"Content-Length",
-	(void*)[NSString stringWithFormat: @"%d", [wData length]]);
+        (void*)[NSString stringWithFormat: @"%d", [wData length]]);
+    }
 
+  if ([wData length] > 0)
+    {
       /*
        * Assume content type if not specified.
        */
@@ -418,6 +423,7 @@ debugWrite(GSHTTPURLHandle *handle, NSData *data)
 	    (void*)@"application/x-www-form-urlencoded");
 	}
     }
+
   if ((id)NSMapGet(wProperties, (void*)@"Authorization") == nil)
     {
       NSURLProtectionSpace	*space;
diff --git a/Source/NSMetadata.m b/Source/NSMetadata.m
index 351051cb4..b6402a615 100644
--- a/Source/NSMetadata.m
+++ b/Source/NSMetadata.m
@@ -24,10 +24,10 @@
    AutogsdocSource: NSMetadata.m
 */ 
 
-#import <Foundation/NSMetadata.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
+#import "Foundation/NSMetadata.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSString.h"
 #import "GNUstepBase/NSObject+GNUstepBase.h"
 
 // Metadata item constants...