diff --git a/geocoder_autocomplete.info b/geocoder_autocomplete.info
index 71056d7..9d8ff36 100644
--- a/geocoder_autocomplete.info
+++ b/geocoder_autocomplete.info
@@ -1,3 +1,4 @@
 name = Geocoder Autocomplete
 description = Provides a text field widget with autocomplete via the Google Geocoding API.
 core = 7.x
+files[] = views/proximity_plugins/geofieldProximityGeocoderAutocomplete.inc
diff --git a/geocoder_autocomplete.module b/geocoder_autocomplete.module
index eb01cf8..d88b5f7 100644
--- a/geocoder_autocomplete.module
+++ b/geocoder_autocomplete.module
@@ -87,3 +87,26 @@ function geocoder_autocomplete_field_widget_form(&$form, &$form_state, $field, $
 
   return array('value' => $element);
 }
+
+/**
+ * Implements hook proximity_views_handlers().
+ *
+ * Returns metainfo about each of the geofield proximity views classes.
+ */
+
+function geocoder_autocomplete_proximity_views_handlers() {
+  $handlers = array();
+
+  $handlers['geocoder_autocomplete'] = array(
+    'name' => t('Geocoder autocomplete'),
+    'class' => 'geofieldProximityGeocoderAutocomplete',
+  );
+
+  return $handlers;
+}
+
+function geocoder_autocomplete_add_autocomplete_form($form_element) {
+  $form_element['origin']['#autocomplete_path'] = 'geocoder/autocomplete';
+
+  return $form_element;
+}
diff --git a/views/proximity_plugins/geofieldProximityGeocoderAutocomplete.inc b/views/proximity_plugins/geofieldProximityGeocoderAutocomplete.inc
index e69de29..b533ada 100644
--- a/views/proximity_plugins/geofieldProximityGeocoderAutocomplete.inc
+++ b/views/proximity_plugins/geofieldProximityGeocoderAutocomplete.inc
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains geofieldProximityGeocoder.
+ */
+
+class geofieldProximityGeocoderAutocomplete extends geofieldProximityBase implements geofieldProximityPluginInterface {
+  public function value_form(&$form, &$form_state, $views_plugin) {
+    $form['value']['#after_build'] = array('geocoder_autocomplete_add_autocomplete_form');
+  }
+
+  public function getSourceValue($views_plugin) {
+    $geocoder_engine = 'google';
+    $location = (isset($views_plugin->value)) ? $views_plugin->value['origin'] : $views_plugin->options['geofield_proximity_geocoder'];
+    if ($location) {
+      $geocoded_data_raw = geocoder($geocoder_engine, $location);
+
+      if ($geocoded_data_raw) {
+        return array(
+          'latitude' => $geocoded_data_raw->getY(),
+          'longitude' => $geocoded_data_raw->getX(),
+        );
+      }
+    }
+
+    return FALSE;
+  }
+
+}