diff --git a/Makefile b/Makefile
index d9f8070db..52f3a8b08 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,13 @@
 # Most users should simply visit the site root in your web browser.
 #
 #
-URL=`php5 ./cli-script.php SapphireInfo/baseurl`
+URL=`php ./cli-script.php SapphireInfo/baseurl`
 
 test: phpunit
 
 phpunit:
-	php5 ./cli-script.php dev/build "flush=1&$(QUERYSTRING)"
-	php5 ./cli-script.php dev/tests/all "flush=1&$(QUERYSTRING)"
+	php ./cli-script.php dev/build "flush=1&$(QUERYSTRING)"
+	php ./cli-script.php dev/tests/all "flush=1&$(QUERYSTRING)"
 
 windmill:
 	functest ../cms/tests/test_windmill url=${URL}dev/tests/startsession browser=firefox
diff --git a/filesystem/File.php b/filesystem/File.php
index 6daefda8e..d2c5a1e51 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -49,7 +49,7 @@ class File extends DataObject {
 	 */
 	public static $allowed_extensions = array(
 		'','html','htm','xhtml','js','css',
-		'bmp','png','gif','jpg','jpeg','ico','pcx','tif','tiff','ai','eps',
+		'bmp','png','gif','jpg','jpeg','ico','pcx','tif','tiff',
 		'au','mid','midi','mpa','mp3','ogg','m4a','ra','wma','wav','cda',
 		'avi','mpg','mpeg','asf','wmv','m4v','mov','mkv','mp4','swf','flv','ram','rm',
 		'doc','docx','txt','rtf','xls','xlsx','pages',