diff -rupN date/date/date.install date_new/date/date.install
--- date/date/date.install	2009-06-09 08:42:27.000000000 +1000
+++ date/date.install	2009-07-31 13:50:22.000000000 +1000
@@ -531,7 +531,7 @@ function date_update_6005() {
   // We need to abort and tell the user to re-run it.
   // We need a custom abort process because the content_check_update could be OK
   // but we still need to update these values.
-  if (!db_table_exists('date_format') || !db_table_exists('date_format_types')) {
+  if ((!db_table_exists('date_format') && !db_table_exists('date_formats')) || !db_table_exists('date_format_types')) {
     drupal_set_message(t('Some updates are still pending. Please return to <a href="@update-php">update.php</a> and run the remaining updates.', array('@update-php' => base_path() .'update.php?op=selection')), 'error', FALSE);
     $ret['#abort'] = array('success' => FALSE, 'query' => t('Some updates are still pending.<br/>Please re-run the update script.'));
     return $ret;