diff --git a/config.php-dist b/config.php-dist
index 6fc6af7fd..f7848430a 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -30,6 +30,13 @@
 	// crafted SQL queries. This feature is highly experimental and
 	// at this point not user friendly. Use with caution.
 
+	define(DEFAULT_ARTICLE_LIMIT, 0);
+	// default limit for articles to display. Set to 0 for no limit. Not
+	// limited to the default 15, 30, 60 article limits - you may use
+	// any number you want and it will be added to the list. Negative
+	// numbers will be ignored. Anything that evaluates numerically to
+	// zero will be interpreted as 0.
+
 	define(DEFAULT_UPDATE_INTERVAL, 30);
 	// default interval between feed updates, minutes
 
diff --git a/tt-rss.php b/tt-rss.php
index 9d8160df7..018ab8659 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -103,10 +103,28 @@
 		 Limit:
 
 		<select id="limitbox" onchange="javascript:viewCurrentFeed(0, '')">
-			<option>15</option>
-			<option selected>30</option>
-			<option>60</option>
-			<option>All</option>
+		
+		<?
+			$limits = array(15 => 15, 30 => 30, 60 => 60);
+			
+			if (DEFAULT_ARTILE_LIMIT >= 0) {
+				$limits[DEFAULT_ARTICLE_LIMIT] = DEFAULT_ARTICLE_LIMIT; 
+			}
+			
+			asort($limits);
+
+			array_push($limits, 0);
+
+			foreach ($limits as $key) {
+				print "<option";
+				if ($key == DEFAULT_ARTICLE_LIMIT) { print " selected"; }
+				print ">";
+				
+				if ($limits[$key] == 0) { print "All"; } else { print $limits[$key]; }
+				
+				print "</option>";
+			} ?>
+			
 		</select>
 
 		&nbsp;Feed: <input class="button" type="submit"