diff --git a/CHANGELOG b/CHANGELOG
index d50c24e99..2f6db054b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Modified the http library to support servers that don't return valid
+  chunked encoded data, such as the Citrix XML service. [Patrik]
+
 o [NSE] Added brute scripts rlogin-brute and rexec-brute for the rlogin and
   rexec services [Patrik]
 
diff --git a/nselib/http.lua b/nselib/http.lua
index c44184e14..3b29f0778 100644
--- a/nselib/http.lua
+++ b/nselib/http.lua
@@ -493,7 +493,9 @@ local function recv_chunked(s, partial)
 
     line, partial = recv_line(s, partial)
     if not line then
-      return nil, string.format("Didn't find CRLF after chunk-data.")
+	  -- this warning message was initially an error but was adapted
+	  -- to support broken servers, such as the Citrix XML Service
+      stdnse.print_debug(2, "Didn't find CRLF after chunk-data.")
     elseif not string.match(line, "^\r?\n") then
       return nil, string.format("Didn't find CRLF after chunk-data; got %q.", line)
     end