diff --git a/date_ical.module b/date_ical.module
index 23f143b194594620b146c84eeca7c526eda31b71..8f162dc131950a8d8d35d4fd456ac741cdda02b8 100644
--- a/date_ical.module
+++ b/date_ical.module
@@ -332,6 +332,7 @@ function _date_ical_get_location_fields($base = 'node') {
       'text_with_summary',
       'node_reference',
       'addressfield',
+      'location'
     );
     if (!$info || !in_array($info['type'], $supported_location_fields)) {
       continue;
diff --git a/includes/date_ical_plugin_row_ical_entity.inc b/includes/date_ical_plugin_row_ical_entity.inc
index f9167d63f6291b0472a7086d373ba9788df55282..35f7f3493e34fce74fd8c3581bfb2460badcb41a 100644
--- a/includes/date_ical_plugin_row_ical_entity.inc
+++ b/includes/date_ical_plugin_row_ical_entity.inc
@@ -259,6 +259,24 @@ class date_ical_plugin_row_ical_entity extends views_plugin_row {
           }
           $location = implode(', ', array_reverse($locations));
         }
+        elseif ($location_info['type'] == 'location') {
+          $included_fields = array(
+            'name',
+            'additional',
+            'street',
+            'city',
+            'province_name',
+            'postal_code',
+            'country_name'
+          );
+          $location_data = array();
+          foreach ($included_fields as $included_field) {
+            if (!empty($location_field[$included_field])) {
+              $locations_data[] = $location_field[$included_field];
+            }
+          }
+          $location = check_plain(implode(', ', $location_data));
+        }
         else {
           $location = check_plain($location_field['value']);
         }