diff --git a/admin-root/hdr.html b/admin-root/hdr.html
index 78ab04a8..a5247c55 100644
--- a/admin-root/hdr.html
+++ b/admin-root/hdr.html
@@ -5,6 +5,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link rel="stylesheet" type="text/css" href="mt-daapd.css" />
   @ispage status.html:<script type="text/javascript" src="lib-js/prototype.js"></script>:@
+  @ispage status.html:<script type="text/javascript" src="lib-js/script.aculo.us/effects.js"></script>:@
   @ispage status.html:<script type="text/javascript" src="status.js"></script>:@
   @ispage smart.html:<script type="text/javascript" src="smart.js"></script>:@
   @ispage playlist.html:<script type="text/javascript" src="lib-js/prototype.js"></script>:@
diff --git a/admin-root/status.html b/admin-root/status.html
index a469e83c..56305bb9 100644
--- a/admin-root/status.html
+++ b/admin-root/status.html
@@ -15,8 +15,21 @@ table {
 #service th, #thread th {
   text-align: left;
 }
+input {
+  font: icon;
+}
+.timer {
+  background-color: #8CACBB;
+  width: 100px;
+}
+.input_error {
+  border: 1px solid #ff0000;
+}
 </style>
 <h1>Status</h1>
+Next update <div class="timer" id="update_timer"><br></div>
+Update this page every
+<input type="text" id="update" size="3" value="" /> seconds
 <table id="service">
 <thead>
   <tr>
diff --git a/admin-root/status.js b/admin-root/status.js
index 199ef34c..14710376 100644
--- a/admin-root/status.js
+++ b/admin-root/status.js
@@ -1,14 +1,53 @@
 Event.observe(window,'load',initStatus);
 
-var UPDATE_FREQUENCY = 5000; // number of ms between updates
+var UPDATE_FREQUENCY = 5; // number of seconds between updates
 
 function initStatus(e) {
-  new Ajax.Request('xml-rpc?method=stats',{method: 'get',onComplete:rsStats});
-
-  window.setInterval(function () {
-    new Ajax.Request('xml-rpc?method=stats',{method: 'get',onComplete:rsStats});
-  },UPDATE_FREQUENCY);
-
+  Event.observe('update','keyup',Updater.keyUp);
+  Updater.start();
+}
+var Updater = {
+  start: function () {
+    if (f = Cookie.getVar('update_frequency')) {
+      this.frequency = f;
+    } else {
+      this.frequency = UPDATE_FREQUENCY;
+    }
+    $('update').value = this.frequency;
+    new Ajax.Request('xml-rpc?method=stats',{method: 'get',onComplete: rsStats});          
+  },
+  update: function () {
+    $('update_timer').style.width = 100 + 'px';
+    if (Updater.stop) {
+      return;
+    }
+    Updater.effect = new Effect.Scale('update_timer',0,{scaleY: false,duration: Updater.frequency,
+      afterFinish: function() {
+        new Ajax.Request('xml-rpc?method=stats',{method: 'get',onComplete: rsStats});          
+      }});
+  },
+  keyUp: function (e) {
+    var val = $('update').value;
+    if (Updater.oldVal == val) {
+      return;
+    }
+    Updater.oldVal = val;
+    if (Updater.effect) {
+      Updater.effect.cancel();
+    }
+    if (('' == val) || /^\d+$/.test(val)) {
+      Cookie.setVar('update_frequency',val,30);
+      if ('' == val) {
+        Element.removeClassName('update','input_error');
+        return;
+      }
+      Updater.frequency = val;
+      Element.removeClassName('update','input_error');
+      Updater.update();
+    } else {
+      Element.addClassName('update','input_error');
+    }
+  } 
 }
 function rsStats(request) {
   ['service','stat'].each(function (tag) {
@@ -26,6 +65,7 @@ function rsStats(request) {
     row.push(element.childNodes[2].firstChild.nodeValue);
     threadTable.addTbodyRow(row);    
   });
+  Updater.update();
 }
 
 Table = Class.create();
@@ -68,4 +108,27 @@ Object.extend(Element, {
   // We shouldn't end up here;
   return '';
   }
-});    
\ No newline at end of file
+});
+var Cookie = {
+  getVar: function(name) {
+    var cookie = document.cookie;
+    if (cookie.length > 0) {
+      cookie += ';';
+    }
+    re = new RegExp(name + '\=(.*?);' );
+    if (cookie.match(re)) {
+      return RegExp.$1;
+    } else {
+      return '';
+    }
+  },
+  setVar: function(name,value,days) {
+    days = days || 30;
+    var expire = new Date(new Date().getTime() + days*86400);
+    document.cookie = name + '=' + value +';expires=' + expire.toUTCString();
+  },
+  removeVar: function(name) {
+    var date = new Date(12);
+    document.cookie = name + '=;expires=' + date.toUTCString();
+  }
+};