diff --git a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
index 9234f670d4c..24d85fc36e8 100644
--- a/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
+++ b/lib/editor/tinymce/jscripts/patch-tinymce_plugin_media.txt
@@ -11,7 +11,9 @@ diff -u -r1.3 media.js
  
 +        var is_youtube = repo_hook(f.src.value);
 +        if (is_youtube) {
-+            h = '<a href="'+f.src.value+'">youtube video</a>';
++            var re = new RegExp("v\/(.+)\#(.+)", "i");
++            var result = f.src.value.match(re);
++            h = '<a href="'+f.src.value+'">'+result[2]+'</a>';
 +        }
 +
  		ed.execCommand('mceInsertContent', false, h);
diff --git a/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js b/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
index 72262eb9cdc..401b0a01cb4 100644
--- a/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/lib/editor/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
@@ -264,8 +264,11 @@ function insertMedia() {
 		h += ' />';
 
         var is_youtube = repo_hook(f.src.value);
+
         if (is_youtube) {
-            h = '<a href="'+f.src.value+'">youtube video</a>';
+            var re = new RegExp("v\/(.+)\#(.+)", "i");
+            var result = f.src.value.match(re);
+            h = '<a href="'+f.src.value+'">'+result[2]+'</a>';
         }
 
 		ed.execCommand('mceInsertContent', false, h);
diff --git a/repository/youtube/repository.class.php b/repository/youtube/repository.class.php
index 4c19813fce8..a11b4becf88 100644
--- a/repository/youtube/repository.class.php
+++ b/repository/youtube/repository.class.php
@@ -49,7 +49,7 @@ class repository_youtube extends repository {
                 'thumbnail_height'=>120,
                 'size'=>'',
                 'date'=>'',
-                'source'=>$source
+                'source'=>$source.'#'.$title
             );
         } 
         return $list;