diff --git a/plugins/spotweb/spotweb_average b/plugins/spotweb/spotweb_average
index cada6a8c..8cb35bf6 100755
--- a/plugins/spotweb/spotweb_average
+++ b/plugins/spotweb/spotweb_average
@@ -2,7 +2,7 @@
 #
 # Munin plugin for number of spots in a MySQL database
 #
-# Copyright (C) 2011 - Rowdy Schwachöfer (http://rowdy.nl)
+# Copyright (C) 2011 - Rowdy Schwachöfer (http://rowdy.nl)
 #
 # Spotweb       : http://github.com/spotweb/spotweb
 # Original idea : smeerbartje (http://gathering.tweakers.net/forum/myreact/190949)
@@ -72,13 +72,13 @@ $spots =~ /(\d+)/;
 print "spots.value ".$1."\n";
 
 # Downloaded
-my $downloaded = `$MYSQL $MYSQLOPTS -e 'SELECT count(*) as comments FROM $DATABASE.downloadlist WHERE stamp > $FROMSTAMP'`;
+my $downloaded = `$MYSQL $MYSQLOPTS -e 'SELECT count(messageid) as comments FROM $DATABASE.spotstatelist WHERE download IS NOT NULL'`;
 $downloaded =~ /(\d+)/;
 print "downloaded.value ".$1."\n";
 
 # Watchlist
 if($SHOW_WATCHLIST eq 'yes') {
-	my $watchlist = `$MYSQL $MYSQLOPTS -e 'SELECT count(*) as watchlist FROM $DATABASE.watchlist'`;
+	my $watchlist = `$MYSQL $MYSQLOPTS -e 'SELECT count(messageid) as watchlist FROM $DATABASE.spotstatelist WHERE watch IS NOT NULL'`;
 	$watchlist =~ /(\d+)/;
 	print "watchlist.value ".$1."\n";
 }