diff --git a/bin/service/http_server.py b/bin/service/http_server.py
index 3311dd249e7..75043c1cef3 100644
--- a/bin/service/http_server.py
+++ b/bin/service/http_server.py
@@ -287,8 +287,9 @@ def init_xmlrpc():
         reg_http_service(HTTPDir('/xmlrpc/', XMLRPCRequestHandler, True))
         logging.getLogger("web-services").info("Registered XML-RPC over HTTPS")
 
-class StaticHTTPHandler(HttpLogHandler, FixSendError, HTTPHandler):
+class StaticHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
     _logger = logging.getLogger('httpd')
+    _HTTP_OPTIONS = 'OPTIONS GET HEAD'
 
     def __init__(self,request, client_address, server):
         HTTPHandler.__init__(self,request,client_address,server)