diff --git a/forms/HtmlEditorConfig.php b/forms/HtmlEditorConfig.php
index 0324ac2a3..9a38358ca 100644
--- a/forms/HtmlEditorConfig.php
+++ b/forms/HtmlEditorConfig.php
@@ -78,14 +78,15 @@ class HtmlEditorConfig {
 
 		'safari_warning' => false,
 		'relative_urls' => true,
-		'verify_html' => true
+		'verify_html' => true,
+		
 	);
 	
 	/**
 	 * Holder list of enabled plugins
 	 */
 	protected $plugins = array(
-		'contextmenu', 'table', 'emotions', 'paste', '../../tinymce_advcode', 'spellchecker'
+		'contextmenu', 'table', 'emotions', 'paste', '../../tinymce-advcode', 'spellchecker'
 	);
 
 	/**
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 3cca13705..6e0406264 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -13,7 +13,7 @@ if((typeof tinyMCE != 'undefined')) {
 		theme_advanced_toolbar_location : "top",
 		theme_advanced_toolbar_align : "left",
 		theme_advanced_toolbar_parent : "right",
-		plugins : "contextmenu,table,emotions,paste,../../tinymce_advcode,spellchecker",	
+		plugins : "contextmenu,table,emotions,paste,../../tinymce-advcode,spellchecker",	
 		blockquote_clear_tag : "p",
 		table_inline_editing : true,
 		theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,formatselect,separator,bullist,numlist,outdent,indent,blockquote,hr,charmap",
diff --git a/thirdparty/tinymce-advcode/editor_plugin_src.js b/thirdparty/tinymce-advcode/editor_plugin_src.js
index 7dfa9bfb4..d2efdb6c9 100644
--- a/thirdparty/tinymce-advcode/editor_plugin_src.js
+++ b/thirdparty/tinymce-advcode/editor_plugin_src.js
@@ -1,5 +1,6 @@
 (function() {
-  tinymce.PluginManager.requireLangPack('../../tinymce_advcode');
+  tinymce.PluginManager.requireLangPack('advcode');
+  
   tinymce.create('tinymce.plugins.AdvancedCodePlugin', {
     init : function(ed, url) {
       // Register commands
@@ -29,12 +30,12 @@
         longname : 'Advanced Code Editor',
         author : 'Daniel Insley',
         authorurl : 'http://www.danielinsley.com',
-        infourl : 'http://www.danielinsley.com/2008/1/14/tinymce-syntax-highlighted-code-editor',
+        infourl : 'http://github.com/dinsley/tinymce-codepress/tree/master',
         version : tinymce.majorVersion + "." + tinymce.minorVersion
       };
     }
   });
 
   // Register plugin
-  tinymce.PluginManager.add('../../tinymce_advcode', tinymce.plugins.AdvancedCodePlugin);
-})();
+  tinymce.PluginManager.add('advcode', tinymce.plugins.AdvancedCodePlugin);
+})();
\ No newline at end of file