diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 5f3f27a147bb46b20013ed64480580f41e01d58e..6be311937cabb90941aeedb8b6edb0067ed60acf 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -4,6 +4,7 @@ Per-release changes to Geocoder.
 
 == 1.0.3 (??)
 
+* Update Google API URL (thanks github.com/soorajb).
 * Fix bug: stop double-adjusting units when using kilometers (thanks github.com/hairyheron).
 
 == 1.0.2 (2011 June 25)
diff --git a/lib/geocoder/lookups/google.rb b/lib/geocoder/lookups/google.rb
index 4d61dd6c5090747e4c9e9ab5dd82b5dcc604157f..9d0395503b2904654dcb69667742d43c61b944b7 100644
--- a/lib/geocoder/lookups/google.rb
+++ b/lib/geocoder/lookups/google.rb
@@ -31,7 +31,7 @@ module Geocoder::Lookup
         :language => Geocoder::Configuration.language,
         :key => Geocoder::Configuration.api_key
       }
-      "#{protocol}://maps.google.com/maps/api/geocode/json?" + hash_to_query(params)
+      "#{protocol}://maps.googleapis.com/maps/api/geocode/json?" + hash_to_query(params)
     end
   end
 end
diff --git a/lib/geocoder/results/freegeoip.rb b/lib/geocoder/results/freegeoip.rb
index 9aac491999d3e70b01b1e34c644766b6ceeda964..ee2cb6115449622058fa08aa86d435ba568b00b9 100644
--- a/lib/geocoder/results/freegeoip.rb
+++ b/lib/geocoder/results/freegeoip.rb
@@ -4,7 +4,8 @@ module Geocoder::Result
   class Freegeoip < Base
 
     def address(format = :full)
-      "#{city}#{', ' + state_code unless state_code == ''} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
+      s = state_code.to_s == "" ? "" : ", #{state_code}"
+      "#{city}#{s} #{postal_code}, #{country}".sub(/^[ ,]*/, "")
     end
 
     def city