diff --git a/.mrconfig b/.mrconfig
index 3885eafd70..e21212f655 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -17,16 +17,13 @@ svn_branch = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(sv
 [api/src/Db/ADOdb]
 checkout = git clone -b 16.1 ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ADOdb.git
 
-[api/js/ckeditor]
-checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ckeditor.git
-skip = [ $1 = "tag" -o $1 = "untag" -o $1 = "branch" ]
-
 []
 # to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
 checkout = git clone git@github.com:EGroupware/egroupware.git &&
-	/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
+	/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
 update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
-	/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
+	rm -rf api/js/ckeditor;
+	/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
 # uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli
 #post_checkout = /usr/bin/env npm install && /usr/bin/env grunt
 #post_update = /usr/bin/env npm install && /usr/bin/env grunt
diff --git a/Gruntfile.js b/Gruntfile.js
index 2a801027fb..b68656eeb2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -99,7 +99,7 @@ module.exports = function (grunt) {
 						"api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js",
 						"api/js/egw_action/egw_menu_dhtmlx.js",
 						"api/js/jquery/chosen/chosen.jquery.js",
-						"api/js/ckeditor/config.js"
+						"vendor/egroupware/ckeditor/config.js"
 					]
 				}
 			},
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
 						"api/js/etemplate/et2_extension_nextmatch.js",
 						"api/js/etemplate/et2_widget_favorites.js",
 						"api/js/etemplate/et2_widget_html.js",
-						"api/js/ckeditor/adapters/jquery.js",
+						"vendor/egroupware/ckeditor/adapters/jquery.js",
 						"api/js/etemplate/et2_widget_htmlarea.js",
 						"api/js/etemplate/et2_widget_tabs.js",
 						"api/js/etemplate/et2_widget_toolbar.js",
diff --git a/admin/inc/class.admin_messages.inc.php b/admin/inc/class.admin_messages.inc.php
index 3af1d2c85d..b190d67fe6 100644
--- a/admin/inc/class.admin_messages.inc.php
+++ b/admin/inc/class.admin_messages.inc.php
@@ -38,7 +38,7 @@ class admin_messages
 			$GLOBALS['egw']->redirect_link('/admin/index.php');
 		}
 
-		Framework::includeJS('ckeditor','ckeditor');
+		Framework::includeJS('vendor/egroupware/ckeditor/ckeditor.js');
 
 		$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
 		$GLOBALS['egw']->template->set_block('message','form','form');
diff --git a/api/js/etemplate/et2_widget_htmlarea.js b/api/js/etemplate/et2_widget_htmlarea.js
index 9147e2d8a9..ea19cebd9f 100644
--- a/api/js/etemplate/et2_widget_htmlarea.js
+++ b/api/js/etemplate/et2_widget_htmlarea.js
@@ -13,9 +13,9 @@
 /*egw:uses
 	jsapi.jsapi; // Needed for egw_seperateJavaScript
 	/vendor/bower-asset/jquery/dist/jquery.js;
-	ckeditor.ckeditor;
-	ckeditor.config;
-	ckeditor.adapters/jquery;
+	/vendor/egroupware/ckeditor/ckeditor.js;
+	/vendor/egroupware/ckeditor/ckeditor.config;
+	/vendor/egroupware/ckeditor/ckeditor.adapters/jquery;
 	et2_core_baseWidget;
 */
 
diff --git a/api/src/Framework/Bundle.php b/api/src/Framework/Bundle.php
index 5097ff2538..75f7e1c026 100644
--- a/api/src/Framework/Bundle.php
+++ b/api/src/Framework/Bundle.php
@@ -234,8 +234,8 @@ class Bundle
 		// include choosen in api, as old eTemplate uses it and fail if it pulls in half of et2
 		$inc_mgr->include_js_file('/api/js/jquery/chosen/chosen.jquery.js');
 		// include CKEditor in api, as old eTemplate uses it too
-		$inc_mgr->include_js_file('/api/js/ckeditor/ckeditor.js');
-		$inc_mgr->include_js_file('/api/js/ckeditor/config.js');
+		$inc_mgr->include_js_file('/vendor/egroupware/ckeditor/ckeditor.js');
+		$inc_mgr->include_js_file('/vendor/egroupware/ckeditor/config.js');
 		$bundles['api'] = $inc_mgr->get_included_files();
 		self::urls($bundles['api'], $max_mod['api']);
 
diff --git a/api/src/Html.php b/api/src/Html.php
index b3931d00f1..266c6001ac 100644
--- a/api/src/Html.php
+++ b/api/src/Html.php
@@ -448,7 +448,7 @@ class Html
 		}
 
 		//include the ckeditor js file
-		Framework::includeJS('ckeditor','ckeditor','phpgwapi');
+		Framework::includeJS('/vendor/egroupware/ckeditor/ckeditor.js');
 
 		// run content through htmlpurifier
 		if ($_purify && !empty($_content))
@@ -474,7 +474,7 @@ class Html
 		return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true).	// true = double encoding
 '
 <script type="text/javascript">
-window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/";
+window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/vendor/egroupware/ckeditor/";
 egw_LAB.wait(function() {
 	CKEDITOR.replace("'.$_name.'", '.Html\CkEditorConfig::get_ckeditor_config($_mode,
 		$pxheight, $expanded, $_start_path).');
diff --git a/api/src/Html/CkEditorConfig.php b/api/src/Html/CkEditorConfig.php
index 679049f8bd..7bfdbd0c6f 100644
--- a/api/src/Html/CkEditorConfig.php
+++ b/api/src/Html/CkEditorConfig.php
@@ -25,7 +25,7 @@ class CkEditorConfig
 	private static $enterMode = null;
 	private static $skin = null;
 
-	// Defaults, defined in phpgwapi/js/ckeditor/plugins/font/plugin.js
+	// Defaults, defined in /vendor/egroupware/ckeditor/plugins/font/plugin.js
 	public static $font_options = array(
 		'arial, helvetica, sans-serif' => 'Arial',
 		'Comic Sans MS, cursive' => 'Comic Sans MS',
@@ -75,7 +75,7 @@ class CkEditorConfig
 		);
 		$skins = array();
 
-		foreach(scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
+		foreach(scandir(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins') as $skin)
 		{
 			if ($skin[0] == '.') continue;
 
@@ -163,7 +163,7 @@ class CkEditorConfig
 	private static function get_base_path()
 	{
 		//Get the ckeditor base url
-		return $GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/';
+		return $GLOBALS['egw_info']['server']['webserver_url'].'/vendor/egroupware/ckeditor/';
 	}
 
 	/**
@@ -231,7 +231,7 @@ class CkEditorConfig
 			}
 
 			//Check whether the skin actually exists, if not, switch to a default
-			if (!file_exists(EGW_SERVER_ROOT.'/api/js/ckeditor/skins/'.$skin))
+			if (!file_exists(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins/'.$skin))
 			{
 				$skin = "moono"; //this is the basic skin for ckeditor
 			}
diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 5675e5a52e..2d71c5b58a 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -263,7 +263,7 @@ function get_modules_per_repo()
 		}
 		if ($line && $line[0] == '[' && preg_match('/^\[([^]]*)\]/', $line, $matches))
 		{
-			if (in_array($matches[1], array('DEFAULT', 'api/js/ckeditor', 'api/src/Accounts/Ads', 'phpgwapi/js/ckeditor', 'phpgwapi/inc/adldap')))
+			if (in_array($matches[1], array('DEFAULT', 'vendor/egroupware/ckeditor', 'api/src/Accounts/Ads', 'phpgwapi/js/ckeditor', 'phpgwapi/inc/adldap')))
 			{
 				$module = null;
 				continue;
diff --git a/updateGruntfile.php b/updateGruntfile.php
index a7eb50d780..000b33eb9d 100755
--- a/updateGruntfile.php
+++ b/updateGruntfile.php
@@ -54,7 +54,7 @@ foreach(Bundle::all() as $name => $files)
 		unset($files[$key]);
 	}
 	// ckeditor is loaded separate before the bundle
-	if ($name == 'api' && ($key = array_search('api/js/ckeditor/ckeditor.js', $files)))
+	if ($name == 'api' && ($key = array_search('vendor/egroupware/ckeditor/ckeditor.js', $files)))
 	{
 		unset($files[$key]);
 	}