Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.988
diff -u -p -r1.988 node.module
--- modules/node/node.module	13 Oct 2008 00:33:03 -0000	1.988
+++ modules/node/node.module	16 Oct 2008 13:33:49 -0000
@@ -1738,6 +1738,10 @@ function node_block($op = 'list', $delta
 function node_feed($nids = FALSE, $channel = array()) {
   global $base_url, $language;
 
+  if (variable_get('feed_enabled', 1) != 1) {
+    return MENU_NOT_FOUND;
+  }
+
   if ($nids === FALSE) {
     $nids = array();
     $result = db_query_range(db_rewrite_sql('SELECT n.nid, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.created DESC'), 0, variable_get('feed_default_items', 10));
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.101
diff -u -p -r1.101 system.admin.inc
--- modules/system/system.admin.inc	12 Oct 2008 04:30:08 -0000	1.101
+++ modules/system/system.admin.inc	16 Oct 2008 13:33:49 -0000
@@ -1506,7 +1506,7 @@ function system_rss_feeds_settings() {
     '#type' => 'select',
     '#title' => t('Number of items in each feed'),
     '#default_value' => variable_get('feed_default_items', 10),
-    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+    '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
     '#description' => t('Default number of items to include in each feed.')
   );
   $form['feed_item_length'] = array(
@@ -1516,6 +1516,13 @@ function system_rss_feeds_settings() {
     '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')),
     '#description' => t('Global setting for the default display of content items in each feed.')
   );
+  $form['feed_enabled'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('RSS Feed enabled'),
+    '#default_value' => variable_get('feed_enabled', 1),
+    '#tree' => FALSE,
+    '#description' => t('Check here if you want the RSS Feed to be enabled.'),
+  );
 
   return system_settings_form($form);
 }
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.809
diff -u -p -r1.809 common.inc
--- includes/common.inc	15 Oct 2008 16:05:51 -0000	1.809
+++ includes/common.inc	16 Oct 2008 13:33:51 -0000
@@ -164,6 +164,10 @@ function drupal_get_headers() {
 function drupal_add_feed($url = NULL, $title = '') {
   static $stored_feed_links = array();
 
+  if (variable_get('feed_enabled', 1) != 1) {
+    return $stored_feed_links;
+  }
+
   if (!is_null($url) && !isset($stored_feed_links[$url])) {
     $stored_feed_links[$url] = theme('feed_icon', $url, $title);