diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 9fcb2ae8235124d66bdf6140d61890e7cc3042bf..4f9178698b9b9529801361b17312e4a3f7577d46 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -243,6 +243,10 @@ server {
 		
 <tmpl_if name='cgi' op='==' value='y'>
         location /cgi-bin/ {
+            try_files <tmpl_var name='rnd_php_dummy_file'> @cgi;
+        }
+
+        location @cgi {
             try_files $uri =404;
             include /etc/nginx/fastcgi_params;
             root <tmpl_var name='document_root'>;
@@ -318,6 +322,12 @@ server {
                 location ~ \.php$ {
                     try_files <tmpl_var name='rnd_php_dummy_file'> @php;
                 }
+
+<tmpl_if name='cgi' op='==' value='y'>
+                location ~ \.cgi$ {
+                    try_files <tmpl_var name='rnd_php_dummy_file'> @cgi;
+                }
+</tmpl_if>
         }
 </tmpl_loop>
 </tmpl_if>