diff --git a/ns_core.make b/ns_core.make
index 39b6034..0b6c884 100644
--- a/ns_core.make
+++ b/ns_core.make
@@ -179,14 +179,14 @@ projects[entity_translation][subdir] = contrib
 
 ; Use wysiwyg from git to avoid issues with patching
 projects[wysiwyg][type] = module
-projects[wysiwyg][version] = 2.2
+projects[wysiwyg][version] = 2.x-dev
 projects[wysiwyg][download][type] = git
-projects[wysiwyg][download][tag] = 7.x-2.2
+projects[wysiwyg][download][revision] = cc24829
 projects[wysiwyg][subdir] = contrib
 
 ; Libraries
 libraries[ckeditor][download][type] = get
-libraries[ckeditor][download][url] = http://download.cksource.com/CKEditor/CKEditor/CKEditor%203.6.6/ckeditor_3.6.6.zip
+libraries[ckeditor][download][url] = http://download.cksource.com/CKEditor/CKEditor/CKEditor%204.0.1/ckeditor_4.0.1_full.zip
 libraries[ckeditor][destination] = libraries
 
 libraries[epiceditor][download][type] = get
@@ -227,3 +227,6 @@ projects[wysiwyg][patch][1841424] = http://drupal.org/files/wysiwyg-change-epice
 
 ; http://drupal.org/node/1780646
 projects[entity][patch][1780646] = http://drupal.org/files/entity-node-access-1780646-16.patch
+
+; http://drupal.org/node/1853550
+projects[wysiwyg][patch][1853550] = http://drupal.org/files/wysiwyg-support_v4_ckeditor-1853550-73.patch