diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 29f4648..def426d 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -20,7 +20,7 @@ module SearchHelper
 
   def display_results(use_map = true)
 
-    unless use_map && GoogleMaps.enabled?
+    unless use_map && GoogleMaps.enabled?(environment.default_hostname)
       return render(:partial => 'display_results')
     end
 
diff --git a/app/models/google_maps.rb b/app/models/google_maps.rb
index 72955a2..b29376e 100644
--- a/app/models/google_maps.rb
+++ b/app/models/google_maps.rb
@@ -14,20 +14,20 @@ class GoogleMaps
       @config ||= (web2_conf['googlemaps'] || {})
     end
 
-    def enabled?
-      !config['key'].nil?
+    def enabled?(domain)
+      !Domain.find_by_name(domain).google_maps_key.nil?
     end
 
-    def key
-      config['key'] || ''
+    def key(domain)
+      Domain.find_by_name(domain).google_maps_key || ''
     end
 
     def initial_zoom
       config['initial_zoom'] || 4
     end
 
-    def api_url
-      "http://maps.google.com/maps?file=api&v=2&key=#{key}"
+    def api_url(domain)
+      "http://maps.google.com/maps?file=api&v=2&key=#{key(domain)}"
     end
 
   end
diff --git a/app/models/location_block.rb b/app/models/location_block.rb
index 7d38c93..915ed5c 100644
--- a/app/models/location_block.rb
+++ b/app/models/location_block.rb
@@ -20,7 +20,7 @@ class LocationBlock < Block
       '<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() +
       ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
       '&size=205x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
-      profile.lng.to_s() + ',green&key=' + GoogleMaps::key + '&sensor=false"/>',
+      profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>',
       :class => 'the-localization-map' )
     else
       content_tag('i', _('This profile has no geographical position registered.'))
diff --git a/app/views/maps/_google_map.rhtml b/app/views/maps/_google_map.rhtml
index 4cba405..5a73ec8 100644
--- a/app/views/maps/_google_map.rhtml
+++ b/app/views/maps/_google_map.rhtml
@@ -1,4 +1,4 @@
-<%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => GoogleMaps.api_url(profile.default_hostname), :type => 'text/javascript') %>
 
 <script type="text/javascript" >
   var geocoder;
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index 1a464ef..5b21fb6 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -1,4 +1,4 @@
-<%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => GoogleMaps.api_url(environment.default_hostname), :type => 'text/javascript') %>
 
 
 <div style='text-align: center;'>
diff --git a/db/migrate/078_add_google_maps_key_to_domain.rb b/db/migrate/078_add_google_maps_key_to_domain.rb
new file mode 100644
index 0000000..7d0c736
--- /dev/null
+++ b/db/migrate/078_add_google_maps_key_to_domain.rb
@@ -0,0 +1,11 @@
+class AddGoogleMapsKeyToDomain < ActiveRecord::Migration
+
+  def self.up
+    add_column :domains, :google_maps_key, :string
+  end
+
+  def self.down
+    remove_column :domains, :google_maps_key
+  end
+
+end
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index d27882a..ba771cd 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -45,4 +45,13 @@ class MapsControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'input', :attributes => { :name => 'profile_data[city]' }
   end
 
+  should 'add script tag for google maps' do
+    domain = fast_create(Domain, :name => 'domain-with-key', :google_maps_key => 'DOMAIN_KEY')
+    profile.preferred_domain = domain
+    profile.save!
+
+    get 'edit_location', :profile => profile.identifier
+
+    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY'}
+  end
 end
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index f77ee37..7b403c7 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -13,6 +13,10 @@ class SearchControllerTest < Test::Unit::TestCase
     @category = Category.create!(:name => 'my category', :environment => Environment.default)
     Profile.rebuild_index
     Article.rebuild_index
+
+    domain = Environment.default.domains.first
+    domain.google_maps_key = 'ENVIRONMENT_KEY'
+    domain.save!
   end
 
   def test_local_files_reference
@@ -1001,6 +1005,36 @@ class SearchControllerTest < Test::Unit::TestCase
     assert_includes assigns(:results)[:products], prod
   end
 
+  should 'add script tag for google maps if searching products' do
+    get 'index', :query => 'product', :display => 'map', :find_in => ['products']
+
+    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+  end
+
+  should 'add script tag for google maps if searching enterprises' do
+    get 'index', :query => 'enterprise', :display => 'map', :find_in => ['enterprises']
+
+    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+  end
+
+  should 'not add script tag for google maps if searching articles' do
+    get 'index', :query => 'article', :display => 'map', :find_in => ['articles']
+
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+  end
+
+  should 'not add script tag for google maps if searching people' do
+    get 'index', :query => 'person', :display => 'map', :find_in => ['people']
+
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+  end
+
+  should 'not add script tag for google maps if searching communities' do
+    get 'index', :query => 'community', :display => 'map', :find_in => ['communities']
+
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+  end
+
   should 'show events of specific day' do
     person = create_user('anotheruser').person
     event = create_event(person, :name => 'Joao Birthday', :start_date => Date.new(2009, 10, 28))
diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb
index c54662f..082077a 100644
--- a/test/unit/domain_test.rb
+++ b/test/unit/domain_test.rb
@@ -100,4 +100,14 @@ class DomainTest < Test::Unit::TestCase
     assert_equal false, Domain.hosting_profile_at('example.com')
   end
 
+  should 'not crash if key is not defined' do
+    domain = fast_create(Domain, :name => 'domain-without-key')
+    assert_nil domain.google_maps_key
+  end
+
+  should 'return key if defined' do
+    domain = fast_create(Domain, :name => 'domain-with-key', :google_maps_key => 'DOMAIN_KEY')
+    assert_equal 'DOMAIN_KEY', domain.google_maps_key
+  end
+
 end
diff --git a/test/unit/google_maps_test.rb b/test/unit/google_maps_test.rb
index 4264a21..276cced 100644
--- a/test/unit/google_maps_test.rb
+++ b/test/unit/google_maps_test.rb
@@ -3,28 +3,29 @@ require File.dirname(__FILE__) + '/../test_helper'
 class GoogleMapsTest < Test::Unit::TestCase
 
   def setup
+    @domain = fast_create(Domain, :name => 'example-domain', :google_maps_key => 'DOMAIN_KEY')
     # force loading of config at every test
     GoogleMaps.erase_config
   end
 
-  should 'enable when key is defined' do
-    GoogleMaps.stubs(:config).returns({ 'key' => 'MYKEY' })
-    assert GoogleMaps.enabled?
+  attr_reader :domain
+
+  should 'enable when key on domain is defined' do
+    assert GoogleMaps.enabled?(domain.name)
   end
 
-  should 'disable if key not defined' do
-    GoogleMaps.stubs(:config).returns({})
-    assert !GoogleMaps.enabled?
+  should 'disable if key on domain is not defined' do
+    fast_create(Domain, :name => 'domain-without-key')
+    assert !GoogleMaps.enabled?('domain-without-key')
   end
 
   should 'not crash if config not informed' do
     GoogleMaps.stubs(:config).returns({})
-    assert_equal '', GoogleMaps.key
+    assert_equal({}, GoogleMaps.config)
   end
 
   should 'point correctly to google maps' do
-    GoogleMaps.expects(:key).returns('MY_FUCKING_KEY')
-    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=MY_FUCKING_KEY', GoogleMaps.api_url
+    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
   end
 
   should 'provide initial_zoom setting' do
@@ -37,4 +38,10 @@ class GoogleMapsTest < Test::Unit::TestCase
     assert_equal 4, GoogleMaps.initial_zoom
   end
 
+  should 'have different keys to different domains' do
+    other_domain = fast_create(Domain, :name => 'different-domain', :google_maps_key => 'DIFFERENT_DOMAIN_KEY')
+
+    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DOMAIN_KEY', GoogleMaps.api_url(domain.name)
+    assert_equal 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=DIFFERENT_DOMAIN_KEY', GoogleMaps.api_url(other_domain.name)
+  end
 end
--
libgit2 0.21.2