diff --git a/modules/aggregator.module b/modules/aggregator.module
index 16b12d46443..2102837031c 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -666,14 +666,14 @@ function aggregator_view() {
   }
   $output .= theme('table', $header, $rows);
 
-  $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
+  $result = db_query('SELECT c.cid, c.title, count(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid ORDER BY title');
 
   $output .= '<h3>'. t('Category overview') .'</h3>';
 
-  $header = array(t('title'), t('operations'));
+  $header = array(t('title'), t('items'), t('operations'));
   $rows = array();
   while ($category = db_fetch_object($result)) {
-    $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), l(t('edit category'), "admin/aggregator/edit/category/$category->cid"));
+    $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit category'), "admin/aggregator/edit/category/$category->cid"));
   }
   $output .= theme('table', $header, $rows);
 
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 16b12d46443..2102837031c 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -666,14 +666,14 @@ function aggregator_view() {
   }
   $output .= theme('table', $header, $rows);
 
-  $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
+  $result = db_query('SELECT c.cid, c.title, count(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid ORDER BY title');
 
   $output .= '<h3>'. t('Category overview') .'</h3>';
 
-  $header = array(t('title'), t('operations'));
+  $header = array(t('title'), t('items'), t('operations'));
   $rows = array();
   while ($category = db_fetch_object($result)) {
-    $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), l(t('edit category'), "admin/aggregator/edit/category/$category->cid"));
+    $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit category'), "admin/aggregator/edit/category/$category->cid"));
   }
   $output .= theme('table', $header, $rows);