diff --git a/geofield.feeds.inc b/geofield.feeds.inc
index 5a92825..18505ed 100644
--- a/geofield.feeds.inc
+++ b/geofield.feeds.inc
@@ -6,6 +6,65 @@
  */
 
 /**
+ * Implementation of hook_feeds_parser_sources_alter().
+ *
+ * @see geofield_feeds_combined_source().
+ */
+function geofield_feeds_parser_sources_alter(&$sources, $content_type) {
+  $sources['geofield'] = array(
+    'name' => t('Geofield (combined)'),
+    'description' => t('All geographic information from the item.'),
+    'callback' => 'geofield_feeds_combined_source',
+  );
+}
+
+/**
+ * Callback; Provides a source combining geo information from items.
+ *
+ * Currently handles geo output from:
+ *  - simplepie 1.3
+ *  - common syndication parser (feeds 7.x-2.x)
+ *
+ * @param $source
+ *   The FeedsSource object being imported.
+ * @param $result
+ *   The FeedsParserResult object being mapped from.
+ * @param $key
+ *   The key specified in the $sources array in
+ *   hook_feeds_parser_sources_alter().
+ *
+ * @return
+ *   The value to be extracted from the source.
+ *
+ * @see feedsgeo_feeds_parser_sources_alter().
+ */
+function geofield_feeds_combined_source($source, FeedsParserResult $result, $key) {
+  $values = array();
+  $item = $result->currentItem();
+
+  // Simplepie 1.3 output
+  if (isset($item['location_latitude'])) {
+    // Lon X; lat Y
+    foreach ($item['location_latitude'] as $key => $lat) {
+      $point = array('lat' => $lat, 'lon' => $item['location_longitude'][$key]);
+      $values[] = geofield_compute_values($point, 'latlon'); 
+    }
+  }
+  // Common Syndication Parser
+  elseif (isset($item['geolocations']) && is_a($item['geolocations'][0], FeedsGeoTermElement)) {
+    // Presently Common Syndication Parser is just parsing points?
+    // and is creating FeedsGeoTermElements, which is possibly not so useful.
+    // Maybe better if we could read access the original item, or add in to the item parsing?
+    foreach($item['geolocations'] as $geolocation) {
+      $point = array('lat' => $geolocation->lat, 'lon' => $geolocation->lon);
+      $values[] = geofield_compute_values($point, 'latlon'); 
+    }
+  }
+  return $values;
+}
+
+
+/**
  * Implements hook_feeds_node_processor_targets_alter().
  */
 function geofield_feeds_processor_targets_alter(&$targets, $entity_type,
@@ -16,47 +75,12 @@ function geofield_feeds_processor_targets_alter(&$targets, $entity_type,
     if ($info['type'] == 'geofield') {
       $targets[$info['field_name'] . ':wkt'] = array(
         'name' => t($instance['label'] . ' WKT'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':geo_type'] = array(
-        'name' => t($instance['label'] . ' Type'),
-        'callback' => 'geofield_set_target',
+        'callback' => 'geofield_set_target_wkt',
         'real_target' => $info['field_name'],
       );
-      $targets[$info['field_name'] . ':lat'] = array(
-        'name' => t($instance['label'] . ' Latitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':lon'] = array(
-        'name' => t($instance['label'] . ' Longitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':left'] = array(
-        'name' => t($instance['label'] . ' Left Latitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':top'] = array(
-        'name' => t($instance['label'] . ' Top Longitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':right'] = array(
-        'name' => t($instance['label'] . ' Right Latitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':bottom'] = array(
-        'name' => t($instance['label'] . ' Bottom Longitude'),
-        'callback' => 'geofield_set_target',
-        'real_target' => $info['field_name'],
-      );
-      $targets[$info['field_name'] . ':srid'] = array(
-        'name' => t($instance['label'] . ' Projection (SRID)'),
-        'callback' => 'geofield_set_target',
+      $targets[$info['field_name'] . ':combined'] = array(
+        'name' => t($instance['label'] . ' (combined)'),
+        'callback' => 'geofield_set_target_combined',
         'real_target' => $info['field_name'],
       );
     }
@@ -64,7 +88,9 @@ function geofield_feeds_processor_targets_alter(&$targets, $entity_type,
 }
 
 /**
- * Example callback specified in hook_feeds_processor_targets_alter().
+ * Feeds processor target callback from the already combined source.
+ *
+ * @see geofield__feeds_parser_sources_alter
  *
  * @param $source
  *   Field mapper source settings.
@@ -76,8 +102,58 @@ function geofield_feeds_processor_targets_alter(&$targets, $entity_type,
  *   The value to populate the target with.
  *
  */
-function geofield_set_target($source, $entity, $target, $value) {
-  list($field_name, $sub_field) = explode(':', $target, 2);
-  $entity->{$field_name}['und'][0][$sub_field] = $value;
+function geofield_set_target_combined($source, $entity, $target, $value) {
+  $field_name = substr($target, 0, strpos($target, ':'));
+  _geofield_set_target($source, $entity, $field_name, $value);
+}
+
+/**
+ * Feeds processor target callback for WKT source.
+ */
+function geofield_set_target_wkt($source, $entity, $target, $value) {
+  $field_name = substr($target, 0, strpos($target, ':'));
+  $geofield_values = array();
+
+  foreach ($value as $key => $wkt) {
+    $field = array('wkt' => $wkt);
+    $geofield_values[] = geofield_compute_values($field, 'wkt');
+  }
+
+   _geofield_set_target($source, $entity, $field_name, $geofield_values);
 }
 
+/**
+ * Helper function to set values and respect ordinality of field.
+ *
+ * Based on _field_feeds_set_target(). But type set, more keys than just value.
+ *
+ * @param $source
+ *   A FeedsSource object.
+ * @param $entity
+ *   The entity to map to.
+ * @param $target
+ *   The target key on $entity to map to.
+ * @param $value
+ *   The value to map. MUST be an array.
+ */
+function _geofield_set_target($source, $entity, $target, $value) {
+  if (empty($value)) {
+    return;
+  }
+
+  $info = field_info_field($target);
+
+  // Iterate over all values.
+  $i = 0;
+  $field = isset($entity->$target) ? $entity->$target : array();
+  foreach ($value as $v) {
+    if (is_array($v) || is_object($v)) {
+      $field['und'][$i] = $v;
+    }
+    if ($info['cardinality'] == 1) {
+      break;
+    }
+    $i++;
+  }
+  $entity->{$target} = $field;
+}