diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 9c24f8e4..c7c437d7 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -173,7 +173,10 @@ module Jekyll
       self.posts.sort!
 
       # limit the posts if :limit_posts option is set
-      self.posts = self.posts[-limit_posts, limit_posts] if limit_posts
+      if limit_posts
+        limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
+        self.posts = self.posts[-limit, limit]
+      end
     end
 
     # Run each of the Generators.