diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf
index 2668faaf4..85f5bfcec 100644
--- a/src/server/lighttpd.conf
+++ b/src/server/lighttpd.conf
@@ -16,6 +16,9 @@ server.document-root        = basedir + "/gwt/www"
 
 server.errorlog             = basedir + "/error.log"
 
+cgi.assign = ( ".cgi" => "" )
+cgi.execute-x-only = "enable"
+
 index-file.names            = ( "index.html" )
 
 ## set the event-handler (read the performance section in the manual)