diff --git a/website/cgi.go b/website/cgi.go
index 4b270941b..dab5b6d05 100644
--- a/website/cgi.go
+++ b/website/cgi.go
@@ -92,9 +92,9 @@ func (h *CgiHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 		return
 	}
 	defer func() {
-		// TODO: close subprocess somehow? No kill?!
 		cmd.Stdin.Close()
 		cmd.Stdout.Close()
+		cmd.Wait(0)  // no zombies
 	}()
 
 	if req.ContentLength != 0 {