diff --git a/src/Plugin/migrate/cckfield/Geofield.php b/src/Plugin/migrate/cckfield/Geofield.php
new file mode 100644
index 0000000..80d5e4e
--- /dev/null
+++ b/src/Plugin/migrate/cckfield/Geofield.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\geofield\Plugin\migrate\cckfield;
+
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
+
+/**
+ * @MigrateCckField(
+ *   id = "geofield",
+ *   core = {7},
+ *   type_map = {
+ *    "geofield" = "geofield"
+ *   }
+ * )
+ */
+class Geofield extends CckFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldFormatterMap() {
+    return [
+      // source => target
+      'geofield_latlon' => 'geofield_default',
+      'geofield_wkt' => 'geofield_default',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFieldWidgetMap() {
+    return [
+      // source => target
+      'geofield_latlon' => 'geofield_default',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) {
+    $process = [
+      'plugin' => 'geofield_latlon',
+      'source' => $field_name,
+    ];
+    $migration->mergeProcessOfProperty($field_name, $process);
+  }
+
+}
diff --git a/src/Plugin/migrate/process/GeofieldLatLon.php b/src/Plugin/migrate/process/GeofieldLatLon.php
index f7375d0..69d4978 100644
--- a/src/Plugin/migrate/process/GeofieldLatLon.php
+++ b/src/Plugin/migrate/process/GeofieldLatLon.php
@@ -23,11 +23,17 @@ class GeofieldLatLon extends ProcessPluginBase {
    * {@inheritdoc}
    */
   public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    list($lat, $lon) = $value;
-
+    $lat = $lon = '';
+    if (isset($value['lat']) && isset($value['lon'])) {
+      $lat = $value['lat'];
+      $lon = $value['lon'];
+    }
+    else {
+      list($lat, $lon) = $value;
+    }
     if (empty($lat) || empty($lon)) {
       return NULL;
-     }
+    }
 
     $lonlat = \Drupal::service('geofield.wkt_generator')->WktBuildPoint(array($lon, $lat));