diff --git a/classes/ezfsolrdocumentfieldgmaplocation.php b/classes/ezfsolrdocumentfieldgmaplocation.php
index be9c3f63..d65d0662 100644
--- a/classes/ezfsolrdocumentfieldgmaplocation.php
+++ b/classes/ezfsolrdocumentfieldgmaplocation.php
@@ -13,6 +13,7 @@ class ezfSolrDocumentFieldGmapLocation extends ezfSolrDocumentFieldBase
 {
     public static $subattributesDefinition = array( self::DEFAULT_SUBATTRIBUTE => 'text',
                                                     'coordinates' => 'geopoint',
+                                                    'location' => 'location',
                                                     'geohash' => 'geohash',
                                                     'latitude' => 'float',
                                                     'longitude' => 'float' );
@@ -44,6 +45,7 @@ public function getData()
         if ( !empty( $longitude ) && !empty( $latitude ) )
         {
             $data[self::getFieldName( $contentClassAttribute, 'coordinates' )] = $longitude . ',' . $latitude;
+            $data[self::getFieldName( $contentClassAttribute, 'location' )] = $latitude . ',' . $longitude;
             //almost the same input format, Solr will take care of the conversion to a geohash string
             //disabled for now, need to update Solr.war first
             //$data[self::getFieldName( $contentClassAttribute, 'geohash' )] = $longitude . ' ' . $latitude;
diff --git a/classes/ezfsolrdocumentfieldname.php b/classes/ezfsolrdocumentfieldname.php
index c6dc540e..d6856342 100644
--- a/classes/ezfsolrdocumentfieldname.php
+++ b/classes/ezfsolrdocumentfieldname.php
@@ -154,6 +154,7 @@ static function getPostFix( $fieldType )
                                   'tlong' => 'tl',
                                   'tdate' => 'tdt',
                                   'geopoint' => 'gpt',
+                                  'location' => 'loc',
                                   'geohash' => 'gh',
                                   'mstring' => 'ms',
                                   'mtext' => 'mt',
diff --git a/java/solr.multicore/eng-GB/conf/schema.xml b/java/solr.multicore/eng-GB/conf/schema.xml
index b4e8ee6f..af9919f1 100755
--- a/java/solr.multicore/eng-GB/conf/schema.xml
+++ b/java/solr.multicore/eng-GB/conf/schema.xml
@@ -656,6 +656,10 @@
        <dynamicField name="*_tdt" type="tdate"  indexed="true"  stored="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*_gpt" type="geopoint"  indexed="true"  stored="true"/>
+       <!-- location for geospatial searches -->
+       <dynamicField name="*_loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*_bst" type="binary"  indexed="false"  stored="true"/>
 
@@ -687,6 +691,10 @@
        <dynamicField name="*____tdt" type="tdate"  indexed="true"  stored="true" multiValued="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*____gpt" type="geopoint"  indexed="true"  stored="true" multiValued="true"/>
+       <!-- location for geospatial search -->
+       <dynamicField name="*____loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*____bst" type="binary"  indexed="false"  stored="true" multiValued="true"/>
 
diff --git a/java/solr.multicore/fre-FR/conf/schema.xml b/java/solr.multicore/fre-FR/conf/schema.xml
index a33d9669..deddf964 100755
--- a/java/solr.multicore/fre-FR/conf/schema.xml
+++ b/java/solr.multicore/fre-FR/conf/schema.xml
@@ -655,6 +655,10 @@
        <dynamicField name="*_tdt" type="tdate"  indexed="true"  stored="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*_gpt" type="geopoint"  indexed="true"  stored="true"/>
+       <!-- location for geospatial searches -->
+       <dynamicField name="*_loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*_bst" type="binary"  indexed="false"  stored="true"/>
 
@@ -686,6 +690,10 @@
        <dynamicField name="*____tdt" type="tdate"  indexed="true"  stored="true" multiValued="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*____gpt" type="geopoint"  indexed="true"  stored="true" multiValued="true"/>
+       <!-- location for geospatial search -->
+       <dynamicField name="*____loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*____bst" type="binary"  indexed="false"  stored="true" multiValued="true"/>
 
diff --git a/java/solr.multicore/nor-NO/conf/schema.xml b/java/solr.multicore/nor-NO/conf/schema.xml
index 1656f7dc..ae110956 100644
--- a/java/solr.multicore/nor-NO/conf/schema.xml
+++ b/java/solr.multicore/nor-NO/conf/schema.xml
@@ -656,6 +656,10 @@
        <dynamicField name="*_tdt" type="tdate"  indexed="true"  stored="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*_gpt" type="geopoint"  indexed="true"  stored="true"/>
+       <!-- location for geospatial searches -->
+       <dynamicField name="*_loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*_bst" type="binary"  indexed="false"  stored="true"/>
 
@@ -687,6 +691,10 @@
        <dynamicField name="*____tdt" type="tdate"  indexed="true"  stored="true" multiValued="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*____gpt" type="geopoint"  indexed="true"  stored="true" multiValued="true"/>
+       <!-- location for geospatial search -->
+       <dynamicField name="*____loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*____bst" type="binary"  indexed="false"  stored="true" multiValued="true"/>
 
diff --git a/java/solr/conf/schema.xml b/java/solr/conf/schema.xml
index 4afe16fd..8a9bab65 100644
--- a/java/solr/conf/schema.xml
+++ b/java/solr/conf/schema.xml
@@ -654,6 +654,10 @@
        <dynamicField name="*_tdt" type="tdate"  indexed="true"  stored="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*_gpt" type="geopoint"  indexed="true"  stored="true"/>
+       <!-- location for geospatial searches -->
+       <dynamicField name="*_loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*_loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*_bst" type="binary"  indexed="false"  stored="true"/>
 
@@ -685,6 +689,10 @@
        <dynamicField name="*____tdt" type="tdate"  indexed="true"  stored="true" multiValued="true"/>
        <!-- geopoint for geospatial/location searches, boosting, ... -->
        <dynamicField name="*____gpt" type="geopoint"  indexed="true"  stored="true" multiValued="true"/>
+       <!-- location for geospatial search -->
+       <dynamicField name="*____loc" type="location"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_0_coordinate" type="double"  indexed="true"  stored="true"/>
+       <dynamicField name="*____loc_1_coordinate" type="double"  indexed="true"  stored="true"/>
        <!-- storage fields accepts base64 encoded strings -->
        <dynamicField name="*____bst" type="binary"  indexed="false"  stored="true" multiValued="true"/>
 
diff --git a/settings/ezfind.ini b/settings/ezfind.ini
index 9310c888..448f7dd7 100644
--- a/settings/ezfind.ini
+++ b/settings/ezfind.ini
@@ -106,6 +106,7 @@ CustomMap[ezobjectrelation]=ezfSolrDocumentFieldObjectRelation
 CustomMap[ezobjectrelationlist]=ezfSolrDocumentFieldObjectRelation
 CustomMap[ezxmltext]=ezfSolrDocumentFieldXML
 CustomMap[ezmatrix]=ezfSolrDocumentFieldXML
+CustomMap[ezgmaplocation]=ezfSolrDocumentFieldGmapLocation
 
 # since eZ Find 2.3
 # in case eztext attributes are used to store also (partial) html markup