diff --git a/code/staticpublisher/FilesystemPublisher.php b/code/staticpublisher/FilesystemPublisher.php
index c0f684c4..7e6784ec 100644
--- a/code/staticpublisher/FilesystemPublisher.php
+++ b/code/staticpublisher/FilesystemPublisher.php
@@ -37,6 +37,7 @@ class FilesystemPublisher extends StaticPublisher {
 		//$base = preg_replace('/\/[^\/]+\/\.\./','',$base) . '/';
 		
 		if(self::$static_base_url) Director::setBaseURL(self::$static_base_url);
+		if($this->fileExtension == 'php') SSViewer::setOption('rewriteHashlinks', 'php');
 		
 		$files = array();
 		$i = 0;
@@ -97,6 +98,7 @@ class FilesystemPublisher extends StaticPublisher {
 		}
 
 		if(self::$static_base_url) Director::setBaseURL(null);
+		if($this->fileExtension == 'php') SSViewer::setOption('rewriteHashlinks', true);
 
 		//Debug::show(array_keys($files));
 		//Debug::show(array_keys($missingFiles));