diff --git a/geofield.inc b/geofield.inc
index f30ed54..8f1891f 100644
--- a/geofield.inc
+++ b/geofield.inc
@@ -2,7 +2,7 @@
 /**
  * Primary value passed to this field must be the geometry type of the geofield: Point, LineString, Polygon
  *
- * Arguments are used to specify all the other values:
+ * Possible arguments are now subfields for Migrate 2.4:
  *   'wkt' - Well Known Text
  *   'lat' - Latitude.
  *   'lon' - Longitude
@@ -14,17 +14,14 @@
  * Add the source field mappings to the argument array then add null mappings to
  * avoid having fields flagged as as unmapped:
  * @code
- *   $geo_arguments = array(
- *     'lat' => array('source_field' => 'source_field_latidute'),
- *     'lon' => array('source_field' => 'source_field_longitude'),
- *   );
  *   // The geometry type should be passed in as the primary value.
- *   $this->addFieldMapping('field_geofield_dest', 'field_source_geotype')
- *        ->arguments($geo_arguments);
- *   // Since the excerpt is mapped via an argument, add a null mapping so it's
- *   // not flagged as unmapped.
- *   $this->addFieldMapping(NULL, 'source_field_latitude');
- *   $this->addFieldMapping(NULL, 'source_field_longitude');
+ *   $this->addFieldMapping('field_geofield_dest', 'field_source_geotype');
+ *   // Then the sub fields as appropriate:
+ *   // @todo: remove geotype subfield?
+ *   $this->addFieldMapping('field_geofield_dest:geotype', 'field_source_geotype');
+ *   $this->addFieldMapping('field_geofield_dest:lat', 'source_field_latidute');
+ *   $this->addFieldMapping('field_geofield_dest:lon', 'source_field_longitude');
+ *
  * @endcode
  */
 class MigrateGeoFieldHandler extends MigrateFieldHandler {
@@ -32,7 +29,21 @@ class MigrateGeoFieldHandler extends MigrateFieldHandler {
     $this->registerTypes(array('geofield'));
   }
 
+  public function fields($type) {
+    return array(
+      'geo_type' => t('Set to the Geofield geo_type'),
+      'wkt' => t('Well Known Text'),
+      'lat' => t('Latitude.'),
+      'lon' => t('Longitude.'),
+      'top' => t('Top Latitude'),
+      'bottom' => t('Bottom Latitude'),
+      'right' => t('Right Longitude'),
+      'left' => t('Left Longitude'),
+    );
+  }
+
   public function prepare($entity, array $field_info, array $instance, array $values) {
+
     $arguments = array();
 
     if (isset($values['arguments'])) {
@@ -42,10 +53,84 @@ class MigrateGeoFieldHandler extends MigrateFieldHandler {
     $language = $this->getFieldLanguage($entity, $field_info, $arguments);
 
     // Setup the standard Field API array for saving.
-    $delta = 0;
-    foreach ($values as $value) {
-      $return[$language][$delta] = array('geo_type' => $value) + array_intersect_key($arguments, $field_info['columns']);
-      $delta++;
+    foreach ($values as $delta => $value) {
+
+      $item = array();
+
+      if (isset($arguments['geo_type'])) {
+        if (!is_array($arguments['geo_type'])) {
+          $item['geo_type'] = $arguments['geo_type'];
+        }
+        else if (isset($arguments['geo_type'][$delta])) {
+          $item['geo_type'] = $arguments['geo_type'][$delta];
+        }
+      }
+
+      if (isset($arguments['wkt'])) {
+        if (!is_array($arguments['wkt'])) {
+          $item['wkt'] = $arguments['wkt'];
+        }
+        else if (isset($arguments['wkt'][$delta])) {
+          $item['wkt'] = $arguments['wkt'][$delta];
+        }
+      }
+
+      if (isset($arguments['lon'])) {
+        if (!is_array($arguments['lon'])) {
+          $item['lon'] = $arguments['lon'];
+        }
+        else if (isset($arguments['lon'][$delta])) {
+          $item['lon'] = $arguments['lon'][$delta];
+        }
+      }
+
+      if (isset($arguments['lat'])) {
+        if (!is_array($arguments['lat'])) {
+          $item['lat'] = $arguments['lat'];
+        }
+        else if (isset($arguments['lon'][$delta])) {
+          $item['lat'] = $arguments['lat'][$delta];
+        }
+      }
+
+      if (isset($arguments['top'])) {
+        if (!is_array($arguments['top'])) {
+          $item['top'] = $arguments['top'];
+        }
+        else if (isset($arguments['top'][$delta])) {
+          $item['top'] = $arguments['top'][$delta];
+        }
+      }
+
+      if (isset($arguments['bottom'])) {
+        if (!is_array($arguments['bottom'])) {
+          $item['bottom'] = $arguments['bottom'];
+        }
+        else if (isset($arguments['bottom'][$delta])) {
+          $item['bottom'] = $arguments['bottom'][$delta];
+        }
+      }
+
+      if (isset($arguments['right'])) {
+        if (!is_array($arguments['right'])) {
+          $item['right'] = $arguments['right'];
+        }
+        else if (isset($arguments['right'][$delta])) {
+          $item['right'] = $arguments['right'][$delta];
+        }
+      }
+
+      if (isset($arguments['left'])) {
+        if (!is_array($arguments['left'])) {
+          $item['left'] = $arguments['left'];
+        }
+        else if (isset($arguments['left'][$delta])) {
+          $item['left'] = $arguments['left'][$delta];
+        }
+      }
+
+      $return[$language][$delta] = $item;
+
     }
 
     return isset($return) ? $return : NULL;
