diff --git a/ChangeLog b/ChangeLog
index 2569f08c..cc123f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@ Changes in current version:
  o do not insert event into list when evsel->add fails
  o add support for PUT/DELETE requests; from Josh Rotenberg
  o introduce evhttp_accept_socket() to accept from an already created socket
+ o include Content-Length in reply for HTTP/1.0 requests with keep-alive
 
 
 Changes in 1.4.0:
diff --git a/http.c b/http.c
index dccb373e..e2e5aeb3 100644
--- a/http.c
+++ b/http.c
@@ -406,9 +406,12 @@ evhttp_make_header_response(struct evhttp_connection *evcon,
 	    req->response_code_line);
 	evbuffer_add(evcon->output_buffer, line, strlen(line));
 
-	if (req->major == 1 && req->minor == 1) {
+	if (req->major == 1 && req->minor == 1)
 		evhttp_maybe_add_date_header(req->output_headers);
 
+	if (req->major == 1 && 
+	    (req->minor == 1 || 
+		evhttp_is_connection_keepalive(req->input_headers))) {
 		/* 
 		 * we need to add the content length if the user did
 		 * not give it, this is required for persistent