diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index f1bd8355b35ad3e128060408cbd980daa8cc25ea..fe871853dcdc69cf46a23e3877cc4030cc3108e7 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -56,7 +56,7 @@ function editorLoaderConfig(removeAllOSS) {
 	var result = common.loaderConfig();
 
 	// never ship marked in editor
-	result.paths['vs/languages/markdown/common/marked'] = 'out-build/vs/languages/markdown/common/marked.mock';
+	result.paths['vs/base/common/marked/marked'] = 'out-build/vs/base/common/marked/marked.mock';
 
 	if (removeAllOSS) {
 		result.paths['vs/languages/lib/common/beautify-html'] = 'out-build/vs/languages/lib/common/beautify-html.mock';
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index 8fad6d47dbb9bcd7c0edd12085910aa1e23de944..5addc93567cd7c00e0d5f7d8ae55564aa296bb33 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -43,7 +43,7 @@ var indentationFilter = [
 	'!**/vs/languages/sass/test/common/example.scss',
 	'!**/vs/languages/less/common/parser/less.grammar.txt',
 	'!**/vs/languages/css/common/buildscripts/css-schema.xml',
-	'!**/vs/languages/markdown/common/raw.marked.js',
+	'!**/vs/base/common/marked/raw.marked.js',
 	'!**/vs/base/common/winjs.base.raw.js',
 	'!**/vs/base/node/terminateProcess.sh',
 	'!**/vs/base/node/terminateProcess.sh',
diff --git a/src/vs/languages/markdown/common/OSSREADME.json b/src/vs/base/common/marked/OSSREADME.json
similarity index 100%
rename from src/vs/languages/markdown/common/OSSREADME.json
rename to src/vs/base/common/marked/OSSREADME.json
diff --git a/src/vs/languages/markdown/common/marked.d.ts b/src/vs/base/common/marked/marked.d.ts
similarity index 100%
rename from src/vs/languages/markdown/common/marked.d.ts
rename to src/vs/base/common/marked/marked.d.ts
diff --git a/src/vs/languages/markdown/common/marked.js b/src/vs/base/common/marked/marked.js
similarity index 91%
rename from src/vs/languages/markdown/common/marked.js
rename to src/vs/base/common/marked/marked.js
index a22f686529d7b0a66b814d19a7a4be0d081e4505..5571d3bd085593ab456bd688c95ec233e580b54a 100644
--- a/src/vs/languages/markdown/common/marked.js
+++ b/src/vs/base/common/marked/marked.js
@@ -5,7 +5,7 @@
 
 require.config({
 	shim: {
-		'vs/languages/markdown/common/raw.marked': {
+		'vs/base/common/marked/raw.marked': {
 			exports: function () {
 				return this.marked;
 			}
diff --git a/src/vs/languages/markdown/common/marked.license.txt b/src/vs/base/common/marked/marked.license.txt
similarity index 100%
rename from src/vs/languages/markdown/common/marked.license.txt
rename to src/vs/base/common/marked/marked.license.txt
diff --git a/src/vs/languages/markdown/common/marked.mock.ts b/src/vs/base/common/marked/marked.mock.ts
similarity index 100%
rename from src/vs/languages/markdown/common/marked.mock.ts
rename to src/vs/base/common/marked/marked.mock.ts
diff --git a/src/vs/languages/markdown/common/raw.marked.js b/src/vs/base/common/marked/raw.marked.js
similarity index 100%
rename from src/vs/languages/markdown/common/raw.marked.js
rename to src/vs/base/common/marked/raw.marked.js
diff --git a/src/vs/languages/markdown/common/markdownWorker.ts b/src/vs/languages/markdown/common/markdownWorker.ts
index 19ad6689811b2c40e64438148520507a48b56894..e67e2c5662fe156f437b5674432fee3976b4e737 100644
--- a/src/vs/languages/markdown/common/markdownWorker.ts
+++ b/src/vs/languages/markdown/common/markdownWorker.ts
@@ -12,7 +12,7 @@ import EditorCommon = require('vs/editor/common/editorCommon');
 import Modes = require('vs/editor/common/modes');
 import Strings = require('vs/base/common/strings');
 import Paths = require('vs/base/common/paths');
-import Marked = require('vs/languages/markdown/common/marked');
+import Marked = require('vs/base/common/marked/marked');
 import ModesExtensions = require('vs/editor/common/modes/modesRegistry');
 import {tokenizeToString} from 'vs/editor/common/modes/textToHtmlTokenizer';
 import Platform = require('vs/platform/platform');