diff --git a/frontend/locales/english.lng b/frontend/locales/english.lng
index 2aecdd1..69c5c88 100644
--- a/frontend/locales/english.lng
+++ b/frontend/locales/english.lng
@@ -29,6 +29,7 @@ title-reinstall;							Reinstall your VPS
 title-password;								Set new root password
 title-console;								Out-of-band console
 title-admin-userlist;							User overview
+title-admin-containerlist;						Container overview
 title-admin-userinfo;							User lookup
 
 header-admin-user-containers;						Containers owned by this user
diff --git a/frontend/module.admin.containers.php b/frontend/module.admin.containers.php
new file mode 100644
index 0000000..dc73397
--- /dev/null
+++ b/frontend/module.admin.containers.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * CVM is more free software. It is licensed under the WTFPL, which
+ * allows you to do pretty much anything with it, without having to
+ * ask permission. Commercial use is allowed, and no attribution is
+ * required. We do politely request that you share your modifications
+ * to benefit other developers, but you are under no enforced
+ * obligation to do so :)
+ * 
+ * Please read the accompanying LICENSE document for the full WTFPL
+ * licensing text.
+ */
+
+$sContainerList = array();
+
+if($result = mysql_query_cached("SELECT * FROM containers"))
+{
+	foreach($result->data as $row)
+	{
+		$sContainer = new Container($row);
+		
+		$sContainerList[] = array(
+			'id'			=> $sContainer->sId,
+			'hostname'		=> $sContainer->sHostname,
+			'node'			=> $sContainer->sNode->sName,
+			'node-hostname'		=> $sContainer->sNode->sHostname,
+			'template'		=> $sContainer->sTemplate->sName,
+			'diskspace'		=> number_format($sContainer->sDiskSpace / 1024),
+			'diskspace-unit'	=> "GB",
+			'guaranteed-ram'	=> $sContainer->sGuaranteedRam,
+			'guaranteed-ram-unit'	=> "MB",
+			'status'		=> $sContainer->sStatusText,
+			'virtualization-type'	=> $sContainer->sVirtualizationType
+		);
+	}
+}
+
+$sPageContents = Templater::InlineRender("admin.containers", $locale->strings, array(
+	'containers'		=> $sContainerList
+));
diff --git a/frontend/module.admin.php b/frontend/module.admin.php
index 2c4d46d..69c5026 100644
--- a/frontend/module.admin.php
+++ b/frontend/module.admin.php
@@ -30,6 +30,7 @@ try
 		0 => array(
 			'^/admin/?$'			=> "module.admin.overview.php",
 			'^/admin/users/?$'		=> "module.admin.users.php",
+			'^/admin/containers/?$'		=> "module.admin.containers.php",
 			'^/admin/user/([0-9]+)/?$'	=> "module.admin.user.php"
 		)
 	);
diff --git a/frontend/templates/admin.containers.tpl b/frontend/templates/admin.containers.tpl
new file mode 100644
index 0000000..91ed983
--- /dev/null
+++ b/frontend/templates/admin.containers.tpl
@@ -0,0 +1,52 @@
+<h2><%!title-admin-containerlist></h2>
+
+<table class="vpslist">
+	<tr>
+		<th></th>
+		<th><%!list-column-hostname></th>
+		<th><%!list-column-platform></th>
+		<th><%!list-column-disk></th>
+		<th><%!list-column-ram></th>
+		<th><%!list-column-template></th>
+	</tr>
+	<%foreach container in containers>
+		<tr class="clickable" data-url="/<%?container[id]>/">
+			<td class="container-status">
+				<%if container[status] == running>
+					<img src="/images/icon_online.png" alt="<%!list-status-running>">
+				<%/if><%if container[status] == stopped>
+					<img src="/images/icon_offline.png" alt="<%!list-status-stopped>">
+				<%/if><%if container[status] == suspended>
+					<img src="/images/icon_suspended.png" alt="<%!list-status-suspended>">
+				<%/if>
+			</td>
+			<td>
+				<a href="/<%?container[id]>/">
+					<%?container[hostname]>
+				</a>
+			</td>
+			<td>
+				<a href="/<%?container[id]>/">
+					<%if container[virtualization-type] == 1>
+						OpenVZ
+					<%/if><%if container[virtualization-type] == 2>
+						Xen PV
+					<%/if><%if container[virtualization-type] == 3>
+						Xen HVM
+					<%/if><%if container[virtualization-type] == 4>
+						KVM
+					<%/if>
+				</a>
+			</td>
+			<td>
+				<%?container[diskspace]>
+				<span class="unit"><%?container[diskspace-unit]></span>
+			</td>
+			<td>
+				<%?container[guaranteed-ram]>
+				<span class="unit"><%?container[guaranteed-ram-unit]></span>
+			</td>
+			<td><%?container[template]></td>
+		</tr>
+	<%/foreach>
+</table>