diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index e40c130b2d549cc288eeefe8df9e494fd6c00a0c..0832ac3e161c901da8104e1fe6bfeea54ca06707 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Clean up Fixtures.reset_sequences for PostgreSQL.  Handle tables with no rows and models with custom primary keys.  #2174 [jay@jay.fm]
+
 * Improve error message when nil is assigned to an attr which validates_size_of within a range.  #2022 [Manuel Holtgrewe <purestorm@ggnore.net>]
 
 * Make update_attribute use the same writer method that update_attributes uses.
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 50e45e10e61a4daefa3ed7e595f149e5fc32524a..eb97c0f469ac36d77f757c7fb863895baf496c81 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -252,9 +252,9 @@ def self.reset_sequences(connection, table_names)
     table_names.flatten.each do |table|
       if table_class = table.to_s.classify.constantize rescue nil
         pk = table_class.columns_hash[table_class.primary_key]
-        if pk and pk.name == 'id' and pk.type == :integer
+        if pk and pk.type == :integer
           connection.execute(
-            "SELECT setval('#{table}_id_seq', (SELECT MAX(id) FROM #{table}), true)", 
+            "SELECT setval('#{table}_#{pk.name}_seq', (SELECT COALESCE(0, MAX(#{pk.name}))+1 FROM #{table}), false)", 
             'Setting Sequence'
           )
         end