diff --git a/views/addressfield.views.inc b/views/addressfield.views.inc
index 77a5b45..326a454 100644
--- a/views/addressfield.views.inc
+++ b/views/addressfield.views.inc
@@ -22,5 +22,23 @@ function addressfield_field_views_data($field) {
     }
   }
 
+  // Add a field definition/handler for each address component.
+  foreach ($data as &$table) {
+    if ($field_def = $table[$field['field_name']]['field']) {
+      foreach ($table as $column_name => &$column) {
+        if (empty($column['field'])) {
+          $column['field'] = $field_def;
+          $column['field']['handler'] = 'views_handler_field';
+          $column['field']['real field'] = $column_name;
+          $column['field']['additional fields'] = array(
+            'delta',
+            'language',
+            'bundle',
+          );
+        }
+      }
+    }
+  }
+
   return $data;
 }