diff --git a/drupalroot/sites/all/modules/contrib/addressfield/views/addressfield.views.inc b/drupalroot/sites/all/modules/contrib/addressfield/views/addressfield.views.inc
index be5765d..3492083 100644
--- a/drupalroot/sites/all/modules/contrib/addressfield/views/addressfield.views.inc
+++ b/drupalroot/sites/all/modules/contrib/addressfield/views/addressfield.views.inc
@@ -6,7 +6,7 @@
 function addressfield_field_views_data($field) {
   $data = field_views_field_default_views_data($field);
 
-  // Add a handler for countries.
+  // Add a filter handler for countries.
   foreach ($field['storage']['details']['sql'] as $type => $tables) {
     foreach ($tables as $table_name => $columns) {
       if (!isset($columns['country'])) {
@@ -22,5 +22,16 @@ function addressfield_field_views_data($field) {
     }
   }
 
+  // Add a field definition/handler to each address component.
+  foreach($data as &$table) {
+    $field_def = $table[$field['field_name']]['field'];
+    foreach($table as $column_name => &$column) {
+      if (empty($column['field'])) {
+        $column['field'] = $field_def;
+        $column['field']['real field'] = $column_name;
+      }
+    }
+  }
+
   return $data;
 }