diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf
index c82f5c8e49..6c701b0218 100644
--- a/phpBB/docs/nginx.sample.conf
+++ b/phpBB/docs/nginx.sample.conf
@@ -61,9 +61,17 @@ http {
 
         root /path/to/phpbb;
 
+        # strip app.php/ prefix if it is present
+        rewrite ^/app\.php/?(.*)$ /$1 permanent;
+
         location / {
             # phpbb uses index.htm
             index index.php index.html index.htm;
+            try_files $uri @rewriteapp;
+        }
+
+        location @rewriteapp {
+            rewrite ^(.*)$ /app.php/$1 last;
         }
 
         # Deny access to internal phpbb files.
@@ -76,11 +84,12 @@ http {
 
         # Pass the php scripts to fastcgi server specified in upstream declaration.
         location ~ \.php$ {
-            fastcgi_pass php;
-            # Necessary for php.
-            fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
             # Unmodified fastcgi_params from nginx distribution.
             include fastcgi_params;
+            # Necessary for php.
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            fastcgi_pass php;
         }
 
         # Deny access to version control system directories.