diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi
index d542d0b2a70f69d18e1d6b7917be0b4b7c1f34cc..1522871057e3214c91f04544bd662bd2f4d2c63b 100755
--- a/daemons/ganeti-rapi
+++ b/daemons/ganeti-rapi
@@ -36,13 +36,15 @@ from ganeti import ssconf
 from ganeti import utils
 from ganeti.rapi import connector
 
+import ganeti.http.server
 
-class RemoteApiHttpServer(http.HttpServer):
+
+class RemoteApiHttpServer(http.server.HttpServer):
   """REST Request Handler Class.
 
   """
   def __init__(self, *args, **kwargs):
-    http.HttpServer.__init__(self, *args, **kwargs)
+    http.server.HttpServer.__init__(self, *args, **kwargs)
     self._resmap = connector.Mapper()
 
   def HandleRequest(self, req):