diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index beb709197..748d48ec1 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -9,9 +9,9 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.69 $
- * $Date: 2009-11-16 20:40:39 $
- * $Author: e107steved $
+ * $Revision: 1.70 $
+ * $Date: 2009-11-17 09:11:05 $
+ * $Author: marj_nl_fr $
 */
 
 if (!defined('e107_INIT')) { exit; }
@@ -1223,6 +1223,7 @@ class e107
 			define("e_FILE_ABS", e_HTTP.$FILES_DIRECTORY);
 			define("e_HANDLER_ABS", e_HTTP.$HANDLERS_DIRECTORY);
 			define("e_LANGUAGEDIR_ABS", e_HTTP.$LANGUAGES_DIRECTORY);
+			//FIXME Shouldn't be available
 			define("e_MEDIA_ABS", e_HTTP.$MEDIA_DIRECTORY);
 
 			if(isset($_SERVER['DOCUMENT_ROOT']))
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index b8c7bf067..2231b8c36 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -9,9 +9,9 @@
 * Text processing and parsing functions
 *
 * $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
-* $Revision: 1.81 $
-* $Date: 2009-11-16 20:40:39 $
-* $Author: e107steved $
+* $Revision: 1.82 $
+* $Date: 2009-11-17 09:11:05 $
+* $Author: marj_nl_fr $
 *
 */
 if (!defined('e107_INIT')) { exit(); }
@@ -1525,6 +1525,7 @@ class e_parse
 						e_THEME_ABS,
 				//		e_DOWNLOAD_ABS, //impossible when download is done via php.
 						e_HANDLER_ABS,
+						//FIXME Shouldn't be available
 						e_MEDIA_ABS
 					);
 				break;
@@ -1554,6 +1555,7 @@ class e_parse
 				 "{e_THEME}",
 				 //,"{e_DOWNLOAD}"
 				 "{e_HANDLER}",
+				 //FIXME need another name
 				 "{e_MEDIA}"
 			);
 
diff --git a/install_.php b/install_.php
index 383480226..c95716735 100644
--- a/install_.php
+++ b/install_.php
@@ -9,9 +9,9 @@
 * Installation file
 *
 * $Source: /cvs_backup/e107_0.8/install_.php,v $
-* $Revision: 1.49 $
-* $Date: 2009-11-17 07:40:43 $
-* $Author: e107coders $
+* $Revision: 1.50 $
+* $Date: 2009-11-17 09:11:05 $
+* $Author: marj_nl_fr $
 *
 */
 
@@ -28,7 +28,8 @@ $MySQLPrefix	     = 'e107_';
 $ADMIN_DIRECTORY     = "e107_admin/";
 $FILES_DIRECTORY     = "e107_files/";
 $IMAGES_DIRECTORY    = "e107_images/";
-$MEDIA_DIRECTORY	 = "e107_media/";
+//FIXME need another name
+$MEDIA_DIRECTORY     = "e107_media/";
 $THEMES_DIRECTORY    = "e107_themes/";
 $PLUGINS_DIRECTORY   = "e107_plugins/";
 $HANDLERS_DIRECTORY  = "e107_handlers/";