diff --git a/ChangeLog b/ChangeLog
index 56279b99b..b5f35e835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-22  Badlop  <badlop@process-one.net>
 
+	* src/web/ejabberd_http.erl: Add 'http_bind' option for easy
+	configuration of HTTP-Binding
+
 	* src/mod_announce.erl: Fixed unnoticeable bug related to Node
 	matching. Renamed some nonstandard node names according to
 	XEP-0133. Small reordering of clauses. When editing MOTD, display
diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl
index 90d871d22..db6ac620f 100644
--- a/src/web/ejabberd_http.erl
+++ b/src/web/ejabberd_http.erl
@@ -78,19 +78,24 @@ start_link({SockMod, Socket}, Opts) ->
 	    ok
     end,
 
-    %% XXX bard: for backward compatibility: expand web_admin and
-    %% http_poll in Opts respectively to {["admin"],
-    %% ejabberd_web_admin} and {["http-poll"], ejabberd_http_poll}
+    %% XXX bard: for backward compatibility, expand in Opts:
+    %%  web_admin -> {["admin"], ejabberd_web_admin} 
+    %%  http_bind -> {["http-bind"], mod_http_bind}
+    %%  http_poll -> {["http-poll"], ejabberd_http_poll}
 
     RequestHandlers =
 	case lists:keysearch(request_handlers, 1, Opts) of
-             {value, {request_handlers, H}} -> H;
-             false -> []
+	    {value, {request_handlers, H}} -> H;
+	    false -> []
         end ++
         case lists:member(web_admin, Opts) of
             true -> [{["admin"], ejabberd_web_admin}];
             false -> []
         end ++
+        case lists:member(http_bind, Opts) of
+            true -> [{["http-bind"], mod_http_bind}];
+            false -> []
+        end ++
         case lists:member(http_poll, Opts) of
             true -> [{["http-poll"], ejabberd_http_poll}];
             false -> []