diff --git a/lib/rapi/connector.py b/lib/rapi/connector.py
index fd2de927693a29e5ab6e8acd09a89308d42640a0..46b89da10fbbcfd79f8e3c2c1c0bea6965f6937c 100644
--- a/lib/rapi/connector.py
+++ b/lib/rapi/connector.py
@@ -26,8 +26,8 @@
 
 # C0103: Invalid name, since the R_* names are not conforming
 
-import cgi
 import re
+import urlparse
 
 from ganeti import constants
 from ganeti import http
@@ -71,7 +71,7 @@ class Mapper:
     """
     if "?" in uri:
       (path, query) = uri.split("?", 1)
-      args = cgi.parse_qs(query)
+      args = urlparse.parse_qs(query)
     else:
       path = uri
       query = None