diff --git a/ChangeLog b/ChangeLog
index 1c089babb..098c99a0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-02  Alvaro Lopez Ortega  <alvaro@alobbs.com>
 
+	* admin/server.py, admin/main.template.html, admin/Page.py,
+	admin/main.help.html, admin/PageStatus.py, admin/PageMain.py,
+	admin/static/css/cherokee.css, admin/Makefile.am: Adds a new
+	"Status" menu entry in Cherokee admin.
+
 	* cherokee/main.c (process_launch): Report whenever the Cherokee
 	worker could not be spawned.
 
diff --git a/admin/Makefile.am b/admin/Makefile.am
index f46cf1e7c..ccbd4f68e 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -29,7 +29,7 @@ PageAdvanced.py \
 PageEntry.py \
 PageGeneral.py \
 PageIcon.py \
-PageMain.py \
+PageStatus.py \
 PageMime.py \
 PageVServer.py \
 PageVServers.py \
@@ -83,8 +83,8 @@ advanced.help.html \
 entry.help.html \
 general.help.html \
 icon.help.html \
-main.help.html \
-main.template.html \
+status.help.html \
+status.template.html \
 mime.help.html \
 vserver.help.html \
 vservers.help.html \
diff --git a/admin/Page.py b/admin/Page.py
index abfd85383..54b286126 100644
--- a/admin/Page.py
+++ b/admin/Page.py
@@ -36,6 +36,7 @@
 
 PAGE_MENU_MENU = """
 <ul id="nav">
+<li id="status"><a href="/">Status</a></li>
 <li id="general"><a href="/general">General</a></li>
 <li id="vserver"><a href="/vserver">Virtual Servers</a></li>
 <li id="encoder"><a href="/encoder">Encoding</a></li>
diff --git a/admin/PageMain.py b/admin/PageStatus.py
similarity index 92%
rename from admin/PageMain.py
rename to admin/PageStatus.py
index 606f675de..987da56e0 100644
--- a/admin/PageMain.py
+++ b/admin/PageStatus.py
@@ -35,14 +35,14 @@
 </div>
 """
 
-class PageMain (PageMenu, FormHelper):
+class PageStatus (PageMenu, FormHelper):
     def __init__ (self, cfg=None):
-        PageMenu.__init__ (self, 'main', cfg)
-        FormHelper.__init__ (self, 'main', cfg)
+        PageMenu.__init__ (self, 'status', cfg)
+        FormHelper.__init__ (self, 'status', cfg)
 
     def _op_render (self):
         self.AddMacroContent ('title', 'Welcome to Cherokee Admin')
-        self.AddMacroContent ('content', self.Read('main.template'))
+        self.AddMacroContent ('content', self.Read('status.template'))
 
         manager = cherokee_management_get (self._cfg)
         if manager.is_alive():
diff --git a/admin/server.py b/admin/server.py
index 254622fb0..ca3805b07 100755
--- a/admin/server.py
+++ b/admin/server.py
@@ -15,7 +15,7 @@
 from config import *
 from configured import *
 from Post import *
-from PageMain import *
+from PageStatus import *
 from PageGeneral import *
 from PageIcon import *
 from PageMime import *
@@ -123,7 +123,7 @@ def handle_request (self):
         elif uri.startswith('/ajax/update'):
             page = PageAjaxUpdate (cfg)
         elif uri == '/':
-            page = PageMain(cfg)
+            page = PageStatus(cfg)
         else:
             body = "/"
 
diff --git a/admin/static/css/cherokee.css b/admin/static/css/cherokee.css
index 4b36ec7a9..c1f82c4ca 100644
--- a/admin/static/css/cherokee.css
+++ b/admin/static/css/cherokee.css
@@ -64,6 +64,7 @@ body {
     background: transparent url(../images/menu-highlight.png) left top no-repeat;
 }
 
+#body-status #status,
 #body-general #general,
 #body-vserver #vserver,
 #body-encoder #encoder,
diff --git a/admin/main.help.html b/admin/status.help.html
similarity index 100%
rename from admin/main.help.html
rename to admin/status.help.html
diff --git a/admin/main.template.html b/admin/status.template.html
similarity index 100%
rename from admin/main.template.html
rename to admin/status.template.html