diff --git a/website/cgi.go b/website/cgi.go
index db7bc3c8e..0c69ebfee 100644
--- a/website/cgi.go
+++ b/website/cgi.go
@@ -43,7 +43,7 @@ type CgiHandler struct {
 }
 
 func (h *CgiHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	pathInfo := req.URL.RawPath
+	pathInfo := req.URL.Path
 	if strings.HasPrefix(pathInfo, h.Root) {
 		pathInfo = pathInfo[len(h.Root):]
 	}