diff --git a/app/models/rss_feed.rb b/app/models/rss_feed.rb
index 5d227ab..1418ccc 100644
--- a/app/models/rss_feed.rb
+++ b/app/models/rss_feed.rb
@@ -23,7 +23,7 @@ class RssFeed < Article
       if (self.settings[:include] == :parent_and_children) && self.parent
         self.parent.map_traversal
       else
-        profile.recent_documents(10)
+        profile.recent_documents(self.settings[:limit] || 10)
       end
 
 
diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb
index 7af452c..87a36d3 100644
--- a/test/unit/rss_feed_test.rb
+++ b/test/unit/rss_feed_test.rb
@@ -107,7 +107,21 @@ class RssFeedTest < Test::Unit::TestCase
   end
 
   should 'be able to indicate maximum number of items' do
-    flunk 'pending'
+    profile = create_user('testuser').person
+    a1 = profile.articles.build(:name => 'article 1'); a1.save!
+    a2 = profile.articles.build(:name => 'article 2'); a2.save!
+    a3 = profile.articles.build(:name => 'article 3'); a3.save!
+
+    feed = RssFeed.new(:name => 'feed')
+    feed.profile = profile
+    feed.save!
+
+    feed.profile.expects(:recent_documents).with(10).returns([]).once
+    feed.data
+
+    feed.settings[:limit] = 5
+    feed.profile.expects(:recent_documents).with(5).returns([]).once
+    feed.data
   end
 
 end
--
libgit2 0.21.2