diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index c4b9218..4fd7d48 100644
Binary files a/cms/data/content.sqlite and b/cms/data/content.sqlite differ
diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite
index 88005e6..fd7a622 100644
Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ
diff --git a/cms/includes/tinymceimage.inc.php b/cms/includes/tinymceimage.inc.php
new file mode 100644
index 0000000..bb7bc08
--- /dev/null
+++ b/cms/includes/tinymceimage.inc.php
@@ -0,0 +1,20 @@
+<?php
+if(!defined('IN_INDEX')) exit;
+
+if(isset($_SESSION[$settings['session_prefix'].'user_id'])) {
+
+    $img_path = BASE_PATH.MEDIA_DIR;
+    $fp=opendir($img_path);
+    while($file = readdir($fp))
+    {
+        if(preg_match('/\.jpg$/i', $file) || preg_match('/\.jpeg$/i', $file) || preg_match('/\.png$/i', $file) || preg_match('/\.gif$/i', $file)) {
+         $images[] = array("title"=>$file, "value"=>BASE_URL . MEDIA_DIR . $file);
+        }
+    }
+    closedir($fp);
+
+    header('Content-type: application/json');
+    echo json_encode($images);
+    exit;
+}
+?>
diff --git a/cms/index.php b/cms/index.php
index d878210..d04d16d 100644
--- a/cms/index.php
+++ b/cms/index.php
@@ -126,6 +126,7 @@ try
     case 'modal': include('./includes/modal.inc.php'); break;
     case 'thumbnail': include('./includes/insert_thumbnail.inc.php'); break;
     case 'ajaxprocess': include('./includes/ajaxprocess.inc.php'); break;
+    case 'tinymceimage': include('./includes/tinymceimage.inc.php'); break;
     default: include('./includes/admin_index.inc.php');
    }
 
diff --git a/static/js/wysiwyg_init.js b/static/js/wysiwyg_init.js
index 7e80cbd..f9b0fe5 100644
--- a/static/js/wysiwyg_init.js
+++ b/static/js/wysiwyg_init.js
@@ -7,6 +7,8 @@ tinymce.init({
         "advlist autolink lists link image anchor code"
     ],
    target_list:false,
+   relative_urls: false,
+   image_list: 'index.php?mode=tinymceimage',
     
    toolbar: "undo redo | styleselect | bold italic | bullist numlist | link unlink | image | code",
    content_css : "../static/css/wysiwyg.css"