diff --git a/munin_default.module b/munin_default.module
index 5ac3ae1..a787aec 100644
--- a/munin_default.module
+++ b/munin_default.module
@@ -23,12 +23,12 @@ function munin_default_muninplugin() {
   $plugins['user']['curuser'] = array(
     '#label' => t('Currently logged in user'),
     '#description' => t('This item shows the number of currently logged in users.'),
-    '#statement' => 'select count(uid) from {users} where unix_timestamp() - access < (60*5)',
+    '#statement' => 'SELECT COUNT(uid) FROM {users} WHERE UNIX_TIMESTAMP() - access < (60*5)',
   );
   $plugins['user']['newuser'] = array(
     '#label' => t('New users'),
     '#description' => t('This item shows the number of users that have been created.'),
-    '#statement' => 'select count(uid) from {users} where unix_timestamp() - created < (60*5)',
+    '#statement' => 'SELECT COUNT(uid) FROM {users} WHERE UNIX_TIMESTAMP() - created < (60*5)',
   );
 
   $plugins['content'] = array(
@@ -39,22 +39,22 @@ function munin_default_muninplugin() {
   $plugins['content']['curnodes'] = array(
     '#label' => t('Existing nodes'),
     '#description' => t('Number of existing nodes on this site.'),
-    '#statement' => 'select count(nid) from {node}',
+    '#statement' => 'SELECT COUNT(nid) FROM {node}',
   );
   $plugins['content']['curcmnt'] = array(
     '#label' => t('Existing comments'),
     '#description' => t('Number of existing comments on this site.'),
-    '#statement' => 'select count(cid) from {comments}',
+    '#statement' => 'SELECT COUNT(cid) FROM {comment}',
   );
   $plugins['content']['newnodes'] = array(
     '#label' => t('New nodes'),
     '#description' => t('Number of new nodes on this site.'),
-    '#statement' => 'select count(nid) from {node} where unix_timestamp() - created < (60*5)',
+    '#statement' => 'SELECT COUNT(nid) FROM {node} WHERE UNIX_TIMESTAMP() - created < (60*5)',
   );
   $plugins['content']['newcmnt'] = array(
     '#label' => t('New Comments'),
     '#description' => t('Number of new comments on this site.'),
-    '#statement' => 'select count(cid) from {comments} where unix_timestamp() - timestamp < (60*5)',
+    '#statement' => 'SELECT COUNT(cid) FROM {comment} WHERE UNIX_TIMESTAMP() - created < (60*5)',
   );
 
   $watchdog_severity_levels = watchdog_severity_levels();
@@ -74,7 +74,7 @@ function munin_default_muninplugin() {
         'min' => 0,
         'draw' => 'LINE1'
       ),
-      '#statement' => 'select count(wid) from {watchdog} where severity = ' . $id . ';',
+      '#statement' => 'SELECT COUNT(wid) FROM {watchdog} WHERE severity = ' . $id . ';',
     );
   }