diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 13445725ab192f2b0cc44f85316fb2d9dc47117d..a1993133ff04fd48d1f83351152ed7514e2a92e0 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -4,9 +4,10 @@ Per-release changes to Geocoder.
 
 == 0.9.5 (TBA)
 
-* Don't allow :conditions hash in 'options' argument to 'nearbys' method (was deprecated in 0.9.3).
-* Separate Rails 2 and Rails 3-compatible branches.
+* Fix broken PostgreSQL compatibility (now 100% compatible).
 * Switch from Google's XML to JSON geocoding API.
+* Separate Rails 2 and Rails 3-compatible branches.
+* Don't allow :conditions hash in 'options' argument to 'nearbys' method (was deprecated in 0.9.3).
 
 == 0.9.4 (2010 Aug 2)
 
diff --git a/lib/geocoder.rb b/lib/geocoder.rb
index ecb2db92bd7a8ffb04daeefa743437b8cab2e2a2..d2e4eeef4be29516dc37592e4f9e4ab7169e42d3 100644
--- a/lib/geocoder.rb
+++ b/lib/geocoder.rb
@@ -111,6 +111,7 @@ module Geocoder
         ["#{lat_attr} BETWEEN ? AND ? AND #{lon_attr} BETWEEN ? AND ?"] +
         coordinate_bounds(latitude, longitude, radius)
       {
+        :group  => columns.map{ |c| c.name}.join(','),
         :order  => options[:order],
         :limit  => options[:limit],
         :offset => options[:offset],