diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl
index 76d9b2c0b..5137d757f 100644
--- a/src/web/ejabberd_http.erl
+++ b/src/web/ejabberd_http.erl
@@ -562,7 +562,13 @@ make_xhtml_output(State, Status, Headers, XHTML) ->
 		  end, HeadersOut),
     SL = [Version, integer_to_list(Status), " ",
 	  code_to_phrase(Status), "\r\n"],
-    [SL, H, "\r\n", Data].
+
+    Data2 = case State#state.request_method of
+		  'HEAD' -> "";
+		  _ -> Data
+	      end,
+
+    [SL, H, "\r\n", Data2].
 
 make_text_output(State, Status, Headers, Text) when is_list(Text) ->
     make_text_output(State, Status, Headers, list_to_binary(Text));
@@ -599,7 +605,13 @@ make_text_output(State, Status, Headers, Data) when is_binary(Data) ->
 		  end, HeadersOut),
     SL = [Version, integer_to_list(Status), " ",
 	  code_to_phrase(Status), "\r\n"],
-    [SL, H, "\r\n", Data].
+
+    Data2 = case State#state.request_method of
+		  'HEAD' -> "";
+		  _ -> Data
+	      end,
+
+    [SL, H, "\r\n", Data2].
 
 
 parse_lang(Langs) ->