diff --git a/scheme/httpd/core.scm b/scheme/httpd/core.scm
index 6cec0da..dff77da 100644
--- a/scheme/httpd/core.scm
+++ b/scheme/httpd/core.scm
@@ -166,7 +166,9 @@
 			     req)))
 	     (values req response)))))
       (lambda (req response)
-	(send-http-response response (socket:outport sock) options)
+
+	(send-http-response req response (socket:outport sock) options)
+
 	(http-log req http-status/ok))))))
 
 ;;;; HTTP request parsing
@@ -274,8 +276,7 @@
 	     (else (list (substring s start (string-length s)))))))
        (else '()))))
 
-(define (send-http-response response port options)
-
+(define (send-http-headers response port)
   (display server/protocol port)
   (write-char #\space port)
   (display (response-code response) port)
@@ -283,18 +284,24 @@
   (display (response-message response) port)
   (write-crlf port)
 
-  (send-http-headers
+  (send-http-header-fields
    (list (cons 'server server/version)
 	 (cons 'content-type (response-mime response))
 	 (cons 'date (time->http-date-string (response-seconds response))))
    port)
-  (send-http-headers (response-extras response) port)
+  (send-http-header-fields (response-extras response) port)
 
-  (write-crlf port)
+  (write-crlf port))
 
-  (display-http-body (response-body response) port options))
+(define (send-http-response request response port options)
 
-(define (send-http-headers headers port)
+  (if (not (v0.9-request? request))
+      (send-http-headers response port)
+
+  (if (not (string=? (request:method request) "HEAD"))
+      (display-http-body (response-body response) port options))))
+
+(define (send-http-header-fields headers port)
   (for-each (lambda (pair)
 	      (display (car pair) port)
 	      (display ": " port)