diff --git a/phpBB/admin/admin_disallow.php b/phpBB/admin/admin_disallow.php
index 28b17bad7b..d1f5d6f381 100644
--- a/phpBB/admin/admin_disallow.php
+++ b/phpBB/admin/admin_disallow.php
@@ -119,7 +119,7 @@ $template->set_filenames(array(
 
 $template->assign_vars(array(
 	"S_DISALLOW_SELECT" => $disallow_select,
-	"S_FORM_ACTION" => append_sid('admin_disallow.php'),
+	"S_FORM_ACTION" => append_sid("admin_disallow.$phpEx"),
 
 	"L_INFO" => $output_info,
 	"L_DISALLOW_TITLE" => $lang['Disallow_control'],
diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php
index c1c0c227e5..c697fd51e4 100644
--- a/phpBB/admin/admin_forum_prune.php
+++ b/phpBB/admin/admin_forum_prune.php
@@ -45,7 +45,7 @@ if( !empty($setmodules) )
 //
 $phpbb_root_dir = "./../";
 require('pagestart.inc');
-include($phpbb_root_path . 'includes/prune.php');
+include($phpbb_root_path . 'includes/prune.'.$phpEx);
 
 //
 // Get the forum ID for pruning
diff --git a/phpBB/install.php b/phpBB/install.php
index a6cdd9ab4a..efd0d3ba54 100644
--- a/phpBB/install.php
+++ b/phpBB/install.php
@@ -345,8 +345,8 @@ else
 //
 if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1  && !defined("PHPBB_INSTALLED") && empty($HTTP_POST_VARS['upgrade_now']) )
 {
-	header("Content-Type: text/x-delimtext; name=\"config.php\"");
-	header("Content-disposition: attachment; filename=config.php");
+	header("Content-Type: text/x-delimtext; name=\"config.$phpEx\"");
+	header("Content-disposition: attachment; filename=config.$phpEx");
 
 	//
 	// We need to stripslashes no matter what the setting of magic_quotes_gpc is
@@ -463,7 +463,7 @@ else if( !empty($HTTP_POST_VARS['ftp_file']) && !defined("PHPBB_INSTALLED")  )
 		//
 		@ftp_chdir($conn_id, $ftp_dir);
 
-		$res = ftp_put($conn_id, 'config.php', $tmpfname, FTP_ASCII);
+		$res = ftp_put($conn_id, 'config.'.$phpEx, $tmpfname, FTP_ASCII);
 
 		@ftp_quit($conn_id);
 
@@ -799,7 +799,7 @@ else
 			@umask(0111);
 			$no_open = FALSE;
 
-			$fp = @fopen('config.php', 'w');
+			$fp = @fopen('config.'.$phpEx, 'w');
 			if( !$fp )
 			{
 				//