diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d9559dcc787fa425e4ada81f9b9b4ff2f023acb6..194aef3bdba466c377f6ce0b70a5946387b65306 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 //$Id$
 
+CCK 6.x-2.x
+===========
+- #482774 Update breaks when CCK is disabled.
+
 CCK 6.x-2.3
 ===========
 
diff --git a/content.install b/content.install
index 94e961db6de9333b4434f4c7ac12786ea016b9a7..863e0e64f4dd43dd4d88552a36343b3422282864 100644
--- a/content.install
+++ b/content.install
@@ -525,8 +525,13 @@ function content_update_6009() {
  * See http://drupal.org/node/407446.
  */
 function content_update_6010(&$sandbox) {
+  if ($abort = content_check_update()) {
+    return $abort;
+  }
   $ret = array();
 
+  drupal_load('module', 'content');
+
   // Gather list of tables and columns that need to be updated.
   if (!isset($sandbox['tables'])) {
     $sandbox['tables'] = array();