diff --git a/main/newscorm/aicc.class.php b/main/newscorm/aicc.class.php
index 187804ba7a..b7441c3344 100644
--- a/main/newscorm/aicc.class.php
+++ b/main/newscorm/aicc.class.php
@@ -468,20 +468,12 @@ class aicc extends learnpath {
 		--------------------------------------
 		*/
 		/*
-			The first version, using OS unzip, is not used anymore
-			because it does not return enough information.
 			We need to process each individual file in the zip archive to
 			- add it to the database
 			- parse & change relative html links
+			- make sure the filenames are secure (filter funny characters or php extensions)
 		*/
-		if (PHP_OS == 'Linux' && ! get_cfg_var('safe_mode') && false)	// *** UGent, changed by OC ***
-		{
-			// Shell Method - if this is possible, it gains some speed
-			//check availability of 'unzip' first!
-			exec("unzip -d \"".$course_sys_dir."".$new_dir." ".$zip_file_path);
-			if($this->debug>=1){error_log('New LP - found Linux system, using unzip',0);}
-		}
-		elseif(is_dir($course_sys_dir.$new_dir) OR @mkdir($course_sys_dir.$new_dir))
+		if(is_dir($course_sys_dir.$new_dir) OR @mkdir($course_sys_dir.$new_dir))
 		{
 			// PHP method - slower...
 			if($this->debug>=1){error_log('New LP - Changing dir to '.$course_sys_dir.$new_dir,0);}
@@ -516,7 +508,9 @@ class aicc extends learnpath {
 						
 						//TODO RENAMING FILES CAN BE VERY DANGEROUS AICC-WISE, avoid that as much as possible!
 						//$safe_file=replace_dangerous_char($file,'strict');
-						$safe_file = str_replace('\\','/',$file);
+						$find_str = array('\\','.php','.phtml');
+						$repl_str = array('/', '.txt','.txt');
+						$safe_file = str_replace($find_str,$repl_str,$file);
 	
 						if($safe_file != $file){
 							//@rename($course_sys_dir.$new_dir,$course_sys_dir.'/'.$safe_file);
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 1e5330831e..22b6f16845 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1731,7 +1731,7 @@ class learnpath {
 		{
 			if ( preg_match('~.(php.*|phtml)$~i', $thisContent['filename']) )
 			{
-				return '';
+				//New behaviour: Don't do anything. These files will be removed in scorm::import_package
 			}
 			elseif(stristr($thisContent['filename'],'imsmanifest.xml')!==FALSE)
 			{
diff --git a/main/newscorm/scorm.class.php b/main/newscorm/scorm.class.php
index b4a488fba0..6c45c89fad 100644
--- a/main/newscorm/scorm.class.php
+++ b/main/newscorm/scorm.class.php
@@ -583,20 +583,12 @@ class scorm extends learnpath {
 		--------------------------------------
 		*/
 		/*
-			The first version, using OS unzip, is not used anymore
-			because it does not return enough information.
 			We need to process each individual file in the zip archive to
 			- add it to the database
 			- parse & change relative html links
+			- make sure the filenames are secure (filter funny characters or php extensions)
 		*/
-		if (PHP_OS == 'Linux' && ! get_cfg_var('safe_mode') && false)	// *** UGent, changed by OC ***
-		{
-			// Shell Method - if this is possible, it gains some speed
-			//check availability of 'unzip' first!
-			exec("unzip -d \"".$course_sys_dir."".$new_dir." ".$zip_file_path);
-			if($this->debug>=1){error_log('New LP - found Linux system, using unzip',0);}
-		}
-		elseif(is_dir($course_sys_dir.$new_dir) OR @mkdir($course_sys_dir.$new_dir))
+		if(is_dir($course_sys_dir.$new_dir) OR @mkdir($course_sys_dir.$new_dir))
 		{
 			// PHP method - slower...
 			if($this->debug>=1){error_log('New LP - Changing dir to '.$course_sys_dir.$new_dir,0);}
@@ -631,7 +623,9 @@ class scorm extends learnpath {
 						
 						//TODO RENAMING FILES CAN BE VERY DANGEROUS SCORM-WISE, avoid that as much as possible!
 						//$safe_file=replace_dangerous_char($file,'strict');
-						$safe_file = str_replace('\\','/',$file);
+						$find_str = array('\\','.php','.phtml');
+						$repl_str = array('/', '.txt','.txt');
+						$safe_file = str_replace($find_str,$repl_str,$file);
 	
 						if($safe_file != $file){
 							//@rename($course_sys_dir.$new_dir,$course_sys_dir.'/'.$safe_file);