diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 4ec1701839686..19e037e909346 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed pagination to work with joins #1034 [scott@sigkill.org]
+
 * Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 [Dee.Zsombor@gmail.com]
 
 * Added :confirm option to link_to_remote just like link_to has #1082 [yrashk@fp.org.ua]
diff --git a/actionpack/lib/action_controller/pagination.rb b/actionpack/lib/action_controller/pagination.rb
index fd890c53e077b..e0fccc0ce0d13 100644
--- a/actionpack/lib/action_controller/pagination.rb
+++ b/actionpack/lib/action_controller/pagination.rb
@@ -150,8 +150,8 @@ def create_paginators_and_retrieve_collections #:nodoc:
     # Returns the total number of items in the collection to be paginated for
     # the +model+ and given +conditions+. Override this method to implement a
     # custom counter.
-    def count_collection_for_pagination(model, conditions)
-      model.count(conditions)
+    def count_collection_for_pagination(model, conditions, joins)
+      model.count(conditions,joins)
     end
   
     # Returns a collection of items for the given +model+ and +conditions+,
@@ -168,7 +168,7 @@ def find_collection_for_pagination(model, conditions, order_by, join, paginator)
     def paginator_and_collection_for(collection_id, options) #:nodoc:
       klass = options[:class_name].constantize
       page  = @params[options[:parameter]]
-      count = count_collection_for_pagination(klass, options[:conditions])
+      count = count_collection_for_pagination(klass, options[:conditions], options[:join])
 
       paginator = Paginator.new(self, count, options[:per_page], page)
       
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 7ef6532e5262d..841940897a39a 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -415,7 +415,7 @@ def delete_all(conditions = nil)
       # Returns the number of records that meets the +conditions+. Zero is returned if no records match. Example:
       #   Product.count "sales > 1"
       def count(conditions = nil, joins = nil)
-        tbl_var_name = joins  ? table_name[0,1].downcase : ""
+        tbl_var_name = joins ? table_name[0,1].downcase : ""
         sql  = "SELECT COUNT(*) FROM #{table_name} #{tbl_var_name} "
         sql << ", #{joins} " if joins
         add_conditions!(sql, conditions)