diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 632f1ec..d23ad9e 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -171,11 +171,11 @@ function aggregator_form_opml($form, &$form_state) {
     '#options' => $period,
     '#description' => t('The length of time between feed updates. Requires a correctly configured <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status'))),
   );
-  $form['block'] = array('#type' => 'select',
-    '#title' => t('News items in block'),
-    '#default_value' => 5,
-    '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)),
-    '#description' => t("Drupal can make a block with the most recent news items of a feed. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in a feed's block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/structure/block'))),
+  $form['block'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Create block of feed items'),
+    '#default_value' => isset($feed->block) ? $feed->block : 1,
+    '#description' => t("Drupal can make a block with the most recent news items of this feed. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page.", array('@block-admin' => url('admin/structure/block'))),
   );
 
   // Handling of categories.
diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install
index 54f9053..3ceab00 100644
--- a/core/modules/aggregator/aggregator.install
+++ b/core/modules/aggregator/aggregator.install
@@ -53,7 +53,7 @@ function aggregator_schema() {
         'not null' => TRUE,
         'default' => 0,
         'size' => 'tiny',
-        'description' => 'The number of recent items to show within the category block.',
+        'description' => 'Boolean indicating if there should be a corresponding block for this feed.',
       )
     ),
     'primary key' => array('cid'),