diff --git a/lib/setup.php b/lib/setup.php
index 9ac23f1bc72..e15ea3bb15e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -408,7 +408,15 @@ global $SCRIPT;
         }
         if (!empty($_SERVER['PATH_TRANSLATED'])) {
             $_SERVER['PATH_TRANSLATED'] = stripslashes($_SERVER['PATH_TRANSLATED']);
+    }
+
+/// neutralise nasty chars in PHP_SELF
+    if (isset($_SERVER['PHP_SELF'])) {
+        $phppos = strpos($_SERVER['PHP_SELF'], '.php');
+        if ($phppos !== false) {
+            $_SERVER['PHP_SELF'] = substr($_SERVER['PHP_SELF'], 0, $phppos+4);
         }
+        unset($phppos);
     }
 
 /// initialise ME's