diff -r 5cab6beadebd sites/all/modules/contrib/date/date_views/includes/date_views_fields.inc
--- a/sites/all/modules/contrib/date/date_views/includes/date_views_fields.inc	Fri Feb 18 08:53:32 2011 +0100
+++ b/sites/all/modules/contrib/date/date_views/includes/date_views_fields.inc	Fri Feb 18 16:54:55 2011 +0100
@@ -57,9 +57,7 @@
 
     // For Field module fields, get the date type.
     $custom = array();
-    if ($field_name == 'entity_id' && isset($content_fields[$table_name])) {
-
-      $field_name = $content_fields[$table_name]['entity_id']['field']['field_name'];
+    if (isset($content_fields[$table_name])) {
       $field = field_info_field($field_name);
 
       switch ($field['type']) {
@@ -74,7 +72,7 @@
           $type = 'cck_datetime';
           $sql_type = DATE_DATETIME;
           break;          
-      }      
+      }
       if (empty($type)) {
         // If this is not a date field, nothing more to do.
         continue;
@@ -114,7 +112,8 @@
       if ($field['cardinality'] != 1) {
         array_push($related_fields, "$table_name.delta");
         $delta_field = $table_name . '_delta';
-      }      
+      }
+      $field_name = $field_name . "_value";
     }
 
     // Allow custom modules to provide date fields.
diff -r 5cab6beadebd sites/all/modules/contrib/date/date_views/includes/date_views_filter_handler.inc
--- a/sites/all/modules/contrib/date/date_views/includes/date_views_filter_handler.inc	Fri Feb 18 08:53:32 2011 +0100
+++ b/sites/all/modules/contrib/date/date_views/includes/date_views_filter_handler.inc	Fri Feb 18 16:54:55 2011 +0100
@@ -132,6 +132,7 @@
     if (empty($this->options['date_fields']) && $this->field != 'date_filter') {
       $this->options['date_fields'] = array($this->table .'.'. $this->field);
     }
+    $options = array_merge($options, $this->view->date_info->date_fields);
 
     $form['date_fields'] = array(
       '#title' => t('Date field(s)'),