diff --git a/app/models/blog.rb b/app/models/blog.rb
index bd7f5be..4eff652 100644
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -10,7 +10,7 @@ class Blog < Folder
     blog.feed = blog.feed_attrs
   end
 
-  settings_items :posts_per_page, :type => :integer, :default => 20
+  settings_items :posts_per_page, :type => :integer, :default => 5
   settings_items :title, :type => :string, :default => N_('Blog')
 
   def initialize(*args)
diff --git a/app/models/rss_feed.rb b/app/models/rss_feed.rb
index 67f8342..40172f4 100644
--- a/app/models/rss_feed.rb
+++ b/app/models/rss_feed.rb
@@ -14,9 +14,9 @@ class RssFeed < Article
   end
   alias :settings :body
 
-  # The maximum number of articles to be displayed in the RSS feed.
+  # The maximum number of articles to be displayed in the RSS feed. Default: 10
   def limit
-    settings[:limit]
+    settings[:limit] || 10
   end
   def limit=(value)
     settings[:limit] = value
@@ -68,7 +68,7 @@ class RssFeed < Article
       if (self.include == 'parent_and_children') && self.parent
         self.parent.map_traversal
       else
-        profile.recent_documents(self.limit || 10)
+        profile.recent_documents(self.limit)
       end
   end
   def data
diff --git a/app/views/cms/_blog.rhtml b/app/views/cms/_blog.rhtml
index b51dcc5..ecfcbc1 100644
--- a/app/views/cms/_blog.rhtml
+++ b/app/views/cms/_blog.rhtml
@@ -11,8 +11,8 @@
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
 
 <% f.fields_for 'feed', @article.feed do |feed| %>
-  <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, ['5', '10', '20', '50'])) %>
-  <%= labelled_form_field(_('Use as description in RSS Feed:'), feed.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %>
+  <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, [5, 10, 20, 50])) %>
+  <%= labelled_form_field(_('Use as description in RSS Feed:'), feed.select(:feed_item_description, [ [ _('Article body'), 'body'], [ _('Article abstract'), 'abstract'] ])) %>
 <% end %>
 
 <% f.fields_for 'external_feed_builder', @article.external_feed do |efeed| %>
--
libgit2 0.21.2