diff --git a/activerecord/lib/active_record/associations/through_association_scope.rb b/activerecord/lib/active_record/associations/through_association_scope.rb
index 1365851337eb414365ff12c6f23ca901c6264d7d..649bbd206a41871d62feff7fc2ce293e6e00b8b5 100644
--- a/activerecord/lib/active_record/associations/through_association_scope.rb
+++ b/activerecord/lib/active_record/associations/through_association_scope.rb
@@ -76,14 +76,11 @@ def construct_through_joins
           right_table_and_alias = table_name_and_alias(right.quoted_table_name, table_aliases[right])
           
           if left.source_reflection.nil?
-            # TODO: Perhaps need to pay attention to left.options[:primary_key] and
-            # left.options[:foreign_key] in places here
-            
             case left.macro
               when :belongs_to
                 joins << inner_join_sql(
                   right_table_and_alias,
-                  table_aliases[left],  left.klass.primary_key,
+                  table_aliases[left],  left.association_primary_key,
                   table_aliases[right], left.primary_key_name,
                   reflection_conditions(right_index)
                 )
@@ -91,7 +88,7 @@ def construct_through_joins
                 joins << inner_join_sql(
                   right_table_and_alias,
                   table_aliases[left],  left.primary_key_name,
-                  table_aliases[right], right.klass.primary_key,
+                  table_aliases[right], right.association_primary_key,
                   polymorphic_conditions(left, left),
                   reflection_conditions(right_index)
                 )
diff --git a/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb b/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
index c39ec5d139c59a40a77d66cef0e3d423bf66e00a..3a4601b0324a47611bcf4ce97ca48bc7fccb9840 100644
--- a/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/nested_has_many_through_associations_test.rb
@@ -21,6 +21,7 @@
 require 'models/category'
 require 'models/categorization'
 require 'models/membership'
+require 'models/essay'
 
 # NOTE: Some of these tests might not really test "nested" HMT associations, as opposed to ones which
 # are just one level deep. But it's all the same thing really, as the "nested" code is being 
@@ -31,7 +32,7 @@ class NestedHasManyThroughAssociationsTest < ActiveRecord::TestCase
   fixtures :authors, :books, :posts, :subscriptions, :subscribers, :tags, :taggings,
            :people, :readers, :references, :jobs, :ratings, :comments, :members, :member_details,
            :member_types, :sponsors, :clubs, :organizations, :categories, :categories_posts,
-           :categorizations, :memberships
+           :categorizations, :memberships, :essays
 
   # Through associations can either use the has_many or has_one macros.
   # 
@@ -440,6 +441,20 @@ def test_nested_has_many_through_with_conditions_on_source_associations
     end
   end
   
+  def test_nested_has_many_through_with_foreign_key_option_on_the_source_reflection_through_reflection
+    assert_equal [categories(:general)], organizations(:nsa).author_essay_categories
+    
+    organizations = Organization.joins(:author_essay_categories).
+                                 where('categories.id' => categories(:general).id)
+    assert_equal [organizations(:nsa)], organizations
+    
+    assert_equal categories(:general), organizations(:nsa).author_owned_essay_category
+    
+    organizations = Organization.joins(:author_owned_essay_category).
+                                 where('categories.id' => categories(:general).id)
+    assert_equal [organizations(:nsa)], organizations
+  end
+  
   private
   
     def assert_includes_and_joins_equal(query, expected, association)
diff --git a/activerecord/test/fixtures/authors.yml b/activerecord/test/fixtures/authors.yml
index 6f13ec4dacd417841bab928dbcc9544cb33149bb..832236a486dc144b82e25557be4540c64e9f8d38 100644
--- a/activerecord/test/fixtures/authors.yml
+++ b/activerecord/test/fixtures/authors.yml
@@ -3,6 +3,8 @@ david:
   name: David
   author_address_id: 1
   author_address_extra_id: 2
+  organization_id: No Such Agency
+  owned_essay_id: A Modest Proposal
 
 mary:
   id: 2
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
index 53b3b80950d408fc2d342fe620659bd44f2ae39a..dd8a20ce9bc00853d59a0ac1263f5419ed87cace 100644
--- a/activerecord/test/models/author.rb
+++ b/activerecord/test/models/author.rb
@@ -110,6 +110,9 @@ def testing_proxy_target
   has_many :essays_2, :primary_key => :name, :class_name => 'Essay', :foreign_key => :author_id
   has_many :essay_categories_2, :through => :essays_2, :source => :category
 
+  belongs_to :owned_essay, :primary_key => :name, :class_name => 'Essay'
+  has_one :owned_essay_category, :through => :owned_essay, :source => :category
+
   belongs_to :author_address,       :dependent => :destroy
   belongs_to :author_address_extra, :dependent => :delete, :class_name => "AuthorAddress"
 
diff --git a/activerecord/test/models/organization.rb b/activerecord/test/models/organization.rb
index 1da342a0bd50f390c80cfda686be681c10316c48..c18c28c6966a7350c046de83c3d762074787404a 100644
--- a/activerecord/test/models/organization.rb
+++ b/activerecord/test/models/organization.rb
@@ -2,5 +2,11 @@ class Organization < ActiveRecord::Base
   has_many :member_details
   has_many :members, :through => :member_details
 
+  has_many :authors, :primary_key => :name
+  has_many :author_essay_categories, :through => :authors, :source => :essay_categories
+  
+  has_one :author, :primary_key => :name
+  has_one :author_owned_essay_category, :through => :author, :source => :owned_essay_category
+
   scope :clubs, { :from => 'clubs' }
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index de3baaf4abf5cc146f6b6e548dc5db41926e617d..c77651a782c0c6b1c62a551282bcc745d5516bcf 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -44,6 +44,8 @@ def create_table(*args, &block)
     t.string :name, :null => false
     t.integer :author_address_id
     t.integer :author_address_extra_id
+    t.string :organization_id
+    t.string :owned_essay_id
   end
 
   create_table :author_addresses, :force => true do |t|