diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 06c111b3a7a2dbb73392f5f460368f9b3a4773d2..b4c61f2206bb2a1aabb9eb32a43a766d906ce5a4 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 5.x-2.x, xxxx-xx-xx
 ---------------------------
+#824710 by TwoD: CKEditor not disabled upon enabling.
 #752516 by nquocbao, sun: Fixed openwysiwyg version callback.
 #753536 by TwoD: Fixed version detection for Whizzywig.
 #752516 by nquocbao, sun: Fixed file stream warnings in version callbacks.
diff --git a/wysiwyg.install b/wysiwyg.install
index a3cd47491a382f654ced9c0d1fa32a004eb6a4c3..cccc1b3b1356e64e3e944f4b848d401701ac0d6f 100644
--- a/wysiwyg.install
+++ b/wysiwyg.install
@@ -41,6 +41,7 @@ function wysiwyg_enable() {
   // Disable conflicting, obsolete editor integration modules whenever this
   // module is enabled. This is crude, but the only way to ensure no conflicts.
   module_disable(array(
+    'ckeditor',
     'editarea',
     'editonpro',
     'editor',