diff --git a/drupal-org.make b/drupal-org.make
index 646cc66..6eff126 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -18,9 +18,8 @@ projects[ctools][version] = "1.9"
 projects[ctools][subdir] = "contrib"
 projects[ctools][patch][] = "https://www.drupal.org/files/issues/deprecating_php4_style-2528736-23.patch"
 
-projects[ckeditor][version] = "1.16"
+projects[ckeditor][version] = "1.17"
 projects[ckeditor][subdir] = "contrib"
-projects[ckeditor][patch][] = "https://www.drupal.org/files/issues/make_ckeditor_plugin-2159403-107.patch"
 
 projects[context][version] = "3.6"
 projects[context][subdir] = "contrib"
@@ -138,22 +137,23 @@ projects[localize_fields][subdir] = "contrib"
 projects[mailsystem][version] = "2.34"
 projects[mailsystem][subdir] = "contrib"
 
-projects[manualcrop][download][type] = "git"
-projects[manualcrop][download][branch] = 7.x-1.x
-projects[manualcrop][download][revision] = '332ffcc'
-; projects[manualcrop][patch][] = "https://drupal.org/files/issues/translatable-image-style-labels-2162325-03.patch"
-projects[manualcrop][patch][] = "https://www.drupal.org/files/issues/manualcrop-settings-for-a-file-type-2161875-08.patch"
+projects[manualcrop][version] = "1.6"
 projects[manualcrop][subdir] = "contrib"
+projects[manualcrop][patch][] = "https://www.drupal.org/files/issues/manualcrop-image-reuse-2508773-9.patch"
+projects[manualcrop][patch][] = "https://www.drupal.org/files/issues/manualcrop-settings-for-a-file-type-2161875-08.patch"
+; projects[manualcrop][patch][] = "https://drupal.org/files/issues/translatable-image-style-labels-2162325-03.patch"
 
-projects[media][version] = "2.0-alpha4"
-projects[media][patch][] = https://www.drupal.org/files/issues/media_remove_file_display_alter-2104193-91.patch
-projects[media][patch][] = https://www.drupal.org/files/issues/media-wysiwyg_attach_detach-2328493-3_0.patch
-projects[media][patch][] = https://www.drupal.org/files/issues/media-ckeditor4-media-plugin-2177893-14.patch
-projects[media][patch][] = https://www.drupal.org/files/issues/fix_media_disable_draggable-2374277-8.patch
-projects[media][patch][] = https://www.drupal.org/files/issues/media_link_to_file_with_html-2389819-4.patch
-projects[media][patch][] = https://www.drupal.org/files/issues/ckeditor-plugin-not-working-in-ie9.patch
+projects[media][version] = "2.0-beta13"
+projects[media][patch][] = https://www.drupal.org/files/issues/media-embeddd_documents-2028231-15.patch
+projects[media][patch][] = https://www.drupal.org/files/issues/media-remove_file_display_alter-2104193-105.patch
 projects[media][subdir] = "contrib"
 
+projects[media_ckeditor][version] = "2.0-alpha3"
+projects[media_ckeditor][patch][] = https://www.drupal.org/files/issues/hidpi_icon_for_ckeditor-2549407-2.patch
+projects[media_ckeditor][patch][] = https://www.drupal.org/files/issues/media_ckeditor-multiple_media_links_break-2591069-7.patch
+; projects[media_ckeditor][patch][] = https://www.drupal.org/files/issues/add_translation_of-2682657-2.patch
+projects[media_ckeditor][subdir] = "contrib"
+
 projects[menu_block][version] = "2.7"
 projects[menu_block][patch][] = "https://www.drupal.org/files/issues/menu_block-add-drupal_alter-in-block-view-1872124-4.patch"
 projects[menu_block][patch][] = "https://www.drupal.org/files/menu_block-features-693302-72_0.patch"
@@ -278,7 +278,7 @@ libraries[modernizr][download][url] = "https://github.com/Modernizr/Modernizr/ar
 libraries[modernizr][directory_name] = "modernizr"
 libraries[modernizr][type] = "library"
 libraries[jquery.imgareaselect][download][type] = "get"
-libraries[jquery.imgareaselect][download][url] = "http://odyniec.net/projects/imgareaselect/jquery.imgareaselect-0.9.10.zip"
+libraries[jquery.imgareaselect][download][url] = "https://github.com/odyniec/imgareaselect/archive/v0.9.11-rc.1.tar.gz"
 libraries[jquery.imgareaselect][directory_name] = "jquery.imgareaselect"
 libraries[jquery.imgareaselect][type] = "library"
 libraries[ckeditor][download][type] = "get"
diff --git a/modules/features/dvg_media_file_types/dvg_media_file_types.info b/modules/features/dvg_media_file_types/dvg_media_file_types.info
index 75eff1a..6128af3 100644
--- a/modules/features/dvg_media_file_types/dvg_media_file_types.info
+++ b/modules/features/dvg_media_file_types/dvg_media_file_types.info
@@ -12,6 +12,7 @@ dependencies[] = image
 dependencies[] = link
 dependencies[] = manualcrop
 dependencies[] = media
+dependencies[] = media_ckeditor
 dependencies[] = media_wysiwyg
 dependencies[] = media_wysiwyg_view_mode
 dependencies[] = options
diff --git a/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.ckeditor_profile.inc b/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.ckeditor_profile.inc
index f4c3901..87af4b2 100644
--- a/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.ckeditor_profile.inc
+++ b/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.ckeditor_profile.inc
@@ -87,11 +87,11 @@ config.extraPlugins = \'widget\';',
           ),
           'media' => array(
             'name' => 'media',
-            'desc' => 'Plugin for inserting images from Drupal media module',
-            'path' => '/profiles/dvg/modules/contrib/media/modules/media_wysiwyg/wysiwyg_plugins/media_ckeditor/',
+            'desc' => 'Plugin for embedding files using Media CKEditor',
+            'path' => '%base_path%profiles/dvg/modules/contrib/media_ckeditor/js/plugins/media/',
             'buttons' => array(
               'Media' => array(
-                'icon' => 'images/icon.gif',
+                'icon' => 'icons/media.png',
                 'label' => 'Add media',
               ),
             ),
diff --git a/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.inc b/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.inc
index 53aeb21..ce56881 100644
--- a/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.inc
+++ b/modules/features/dvg_wysiwyg/dvg_wysiwyg.features.inc
@@ -11,7 +11,4 @@ function dvg_wysiwyg_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "linkit" && $api == "linkit_profiles") {
     return array("version" => "1");
   }
-  if ($module == "strongarm" && $api == "strongarm") {
-    return array("version" => "1");
-  }
 }
diff --git a/modules/features/dvg_wysiwyg/dvg_wysiwyg.info b/modules/features/dvg_wysiwyg/dvg_wysiwyg.info
index 03c225a..29adbf8 100644
--- a/modules/features/dvg_wysiwyg/dvg_wysiwyg.info
+++ b/modules/features/dvg_wysiwyg/dvg_wysiwyg.info
@@ -5,6 +5,8 @@ package = Drupal voor Gemeenten
 dependencies[] = ckeditor
 dependencies[] = ctools
 dependencies[] = dvg_global
+dependencies[] = dvg_roles_and_permissions
+dependencies[] = dvg_wysiwyg
 dependencies[] = features
 dependencies[] = filter
 dependencies[] = linkit
@@ -14,10 +16,9 @@ dependencies[] = node_embed
 dependencies[] = token_insert
 dependencies[] = token_insert_ckeditor
 dependencies[] = wysiwyg_filter
-dependencies[] = dvg_roles_and_permissions
-features[ckeditor_profile][] = Email
 features[ckeditor_profile][] = Advanced
 features[ckeditor_profile][] = CKEditor Global Profile
+features[ckeditor_profile][] = Email
 features[ctools][] = linkit:linkit_profiles:1
 features[features_api][] = api:2
 features[filter][] = email_html
@@ -25,4 +26,4 @@ features[filter][] = filtered_html
 features[filter][] = plain_text
 features[linkit_profiles][] = fields_default
 features[linkit_profiles][] = filtered_html_default
-features[linkit_profiles][] = full_html_default
\ No newline at end of file
+features[linkit_profiles][] = full_html_default
diff --git a/modules/features/dvg_wysiwyg/dvg_wysiwyg.install b/modules/features/dvg_wysiwyg/dvg_wysiwyg.install
index bdec77b..854e0d9 100644
--- a/modules/features/dvg_wysiwyg/dvg_wysiwyg.install
+++ b/modules/features/dvg_wysiwyg/dvg_wysiwyg.install
@@ -7,4 +7,10 @@ function dvg_wysiwyg_install() {
   dvg_roles_and_permissions_set_permissions('dvg_wysiwyg');
 }
 
+/**
+ * Enable media_ckeditor module.
+ */
+function dvg_wysiwyg_update_7001(&$sandbox) {
+  module_enable(array('media_ckeditor'));
+}