diff --git a/www/html/status.html b/www/html/status.html
index 70448065..1397862a 100644
--- a/www/html/status.html
+++ b/www/html/status.html
@@ -1,5 +1,5 @@
 <h1>Status</h1>
-<h2>Version 20050615</h2>
+<h2>Current Version: 20050615</h2>
 <p>
 	See <a href="index.php?page=download">download</a> for download
 	information.  This release focused on infrastructure, organization, and
@@ -7,29 +7,105 @@
 	improvements.  Currently only the strict policy is supported, with
 	targeted policy support planned for the future.
 </p>
-<h3>Components which have been completely reworked</h3>
-<ul>
-	<li>All TE policy is organized into modules</li>
-	<li>Most kernel layer interfaces have documentation</li>
-	<li>Documentation for interfaces used to create webpage documentation</li>
-	<li>Infrastructure to support source policies and loadable binary modules</li>
-	<li>Infrastructure to not include modules during build, replacing the unused directory.</li>
-</ul>
-<h3>Components which have minor improvements</h3>
-<ul>
-	<li>MLS infrastructure added to support easy conversion between MLS
-		and non-MLS policy.</li>
-	<li>Some infrastructure added to support per-user domain policy, e.g.,
-		to create types and policy for ssh, for each user.</li>
-	<li>All labeling moved to modules.</li>
-	<li>Tunables are documented, and in the future will be included
-		in the webpage policy documentation.</li>
-</ul>
-<h3>Components that are unchanged</h3>
-<ul>
-	<li>Users</li>
-	<li>Constraints</li>
-	<li>Flask</li>
-	<li>Genhomedircon</li>
-	<li>Top-level Make targets</li>
-</ul>
+<p>
+	This is a prototype release, not meant to be used on real systems.  It
+	is targeted towards developers, to show the direction of the policy's
+	development, and to solicit feedback and assistance.
+</p>
+<table border>
+	<tr>
+		<td><b>Component</b></td>
+		<td><b>Status</b></td>
+		<td><b>Description</b></td>
+	</tr>
+	<tr>
+		<td>Policy Structure</td>
+		<td>Complete</td>
+		<td>The policy is converted over to new Reference Policy structure</td>
+	</tr>
+	<tr>
+		<td>TE Policy</td>
+		<td>Conversion Ongoing</td>
+		<td>Conversion of old policy to Reference Policy modules is ongoing</td>
+	<tr>
+	<tr>
+		<td>Loadable Policy Modules</td>
+		<td>Major improvements</td>
+		<td>Infrastructure is in place to support both source policy and
+			loadable policy modules.  Makefile support planned.</td>
+	</tr>
+	</tr>
+		<td>Documentation Infrastructure</td>
+		<td>Interfaces complete</td>
+		<td>Tools to create webpages from the module interface documentation
+			is complete. Adding tunables to the webpages is planned.</td>
+	</tr>
+	<tr>
+		<td>Policy Documentation</td>
+		<td>Ongoing</td>
+		<td>Most kernel layer modules are documented.</td>
+	</tr>
+	<tr>
+		<td>Unused Modules</td>
+		<td>Complete</td>
+		<td>Modules can be disabled by using modules.conf.</td>
+	</tr>
+	<tr>
+		<td>MLS Infrastructure</td>
+		<td>Minor improvements</td>
+		<td>MLS infrastructure added to support easy conversion between
+			MLS and non-MLS policy.  Policy is compilable, but
+			untested.</td>
+	</tr>
+	<tr>
+		<td>Network Infrastructure</td>
+		<td>Minor improvements</td>
+		<td>All network ports, nodes, and interfaces moved to
+			corenetwork module, interfaces generated automatically.
+			Plan to add more infrastructure for configuration of
+			ports, nodes, and interfaces.</td>
+	</tr>
+	<tr>
+		<td>User domains and roles</td>
+		<td>Minor improvements</td>
+		<td>Some infrastructure added to support per-user domain policy,
+			e.g., to create types and policy for ssh,
+			for each user.  Plan to add infrastructure to easily
+			configure userdomains and roles.</td>
+	</tr>
+	<tr>
+		<td>Labeling</td>
+		<td>Minor improvements</td>
+		<td>All labeling moved to modules, consistent with Reference
+			Policy structure.</td>
+	</tr>
+	<tr>
+		<td>Tunables</td>
+		<td>Minor improvements</td>
+		<td>Tunables are documented, and in the future will be included
+			in the webpage policy documentation.</td>
+	</tr>
+	<tr>
+		<td>Users</td>
+		<td>Unchanged</td>
+		<td>Assignment of users to roles</td>
+	</tr>
+	<tr>
+		<td>Constraints</td>
+		<td>Unchanged</td>
+		<td>Plan to split up into relevant modules.  There are ordering
+			problems with source policies.</td>
+	</tr>
+	<tr>
+		<td>Flask</td>
+		<td>Unchanged</td>
+		<td>Headers for the policy, describing object classes, and
+			their permissions.  No planned changes</td>
+	</tr>
+	<tr>
+		<td>Genhomedircon</td>
+		<td>Unchanged</td>
+		<td>Tool to properly label users' home directories.
+			No planned changes</td>
+	</tr>
+</table>