diff --git a/buildbot/status/web/templates/slaves.html b/buildbot/status/web/templates/slaves.html
new file mode 100644
index 0000000..bcad101
--- /dev/null
+++ b/buildbot/status/web/templates/slaves.html
@@ -0,0 +1,56 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+<h1>Buildslaves</h1>
+
+<div class="column">
+
+<table class="info">
+
+<tr>
+  <th>Name</th>
+  <th>BuildBot</th>
+  <th>Admin</th>
+  <th>Last heard from</th>
+  <th>Status</th>
+</tr>
+
+{% for s in slaves %}
+  <tr class="{{ loop.cycle('alt','') }}">
+  <td><b><a href="{{ s.link }}">{{ s.name }}</a></b></td>
+  
+  <td>{{ s.version or '-' }}</td>
+ 
+  {% if s.connected %}
+    <td>
+    {%- if s.admin -%}
+      Admin: {{ s.admin|email }}
+    {%- endif -%}
+    </td>
+    
+    <td>
+    {%- if s.last_heard_from_age -%}
+      {{ s.last_heard_from_age }} <small>({{ s.last_heard_from_time }})</small>
+    {%- endif -%}
+    </td>
+        
+    {% if s.running_builds %}
+      <td class="building">Running {{ s.running_builds }} build(s)</td>
+    {% else %}
+      <td class="idle">Idle</td>
+    {% endif %}
+        
+  {% else %}
+    <td>-</td>
+    <td>-</td>
+    <td class="offline">Not connected</td>
+  {% endif %}
+  
+  </tr>
+{% endfor %}
+</table>
+
+</div>
+  
+{% endblock %}