diff --git a/en/releases/5.0R/todo.sgml b/en/releases/5.0R/todo.sgml
index 62cc44f4fd..6de815e93c 100644
--- a/en/releases/5.0R/todo.sgml
+++ b/en/releases/5.0R/todo.sgml
@@ -1,140 +1,143 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "../..">
 <!ENTITY email 'freebsd-qa'>
-<!ENTITY date "$FreeBSD: www/en/releases/5.0R/todo.sgml,v 1.2 2002/09/02 11:05:07 murray Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/5.0R/todo.sgml,v 1.3 2002/09/03 03:07:16 rwatson Exp $">
 <!ENTITY title "FreeBSD 5.0 Open Issues">
 <!ENTITY % includes SYSTEM "../../includes.sgml"> %includes;
 ]>
 
 <html>
 &header;
 
 <h1>Open Issues</h1>
 
 <p>This is a list of open issues that need to be resolved for FreeBSD
   5.0.  If you think something should be listed here, please email
   re@FreeBSD.org.  This issue was discussed in detail at the <a
   href="&base;/events/2002/usenix-devsummit.html">Developer Summit</a>
   at Usenix.</p>
 
 
 
 <h3>Must Resolve Issues for 5.0-DP2</h3>
 
 <table border=1 width="100%">
   <tr><th>Issue</th><th>Status</th><th>Responsible</th><th>Description</th>
       </tr>
 
   <tr>
   <td>X instability</td><td>Unknown</td><td>??</td>
 
   <td>XFree86 hangs after several hours/days of use with -CURRENT.  No
     further details are available at this time.</td>
 
   </tr>
 
 </table>
 
 
 <h3>Must Resolve Issues for 5.0-RELEASE</h3>
 
 <table border=1 width="100%">
   <tr><th>Issue</th><th>Status</th><th>Responsible</th><th>Description</th>
       </tr>
 
   <tr><td>5.0 Documentation</td><td>--</td><td>freebsd-doc</td>
 
   <td>As a minimum, we need to cover the areas where 5.x and 4.x
     differ in the FAQ and Handbook.  This entails marking some areas
     with "This procedure is specific to 4.X.  For more information for
     5.x, please see foo(n)" or similar.  This needs to happen quickly,
     to give adequate time fo rthe translation teams to catch up.</td>
   </tr>
 
   <tr><td>devd</td><td>Unknown</td><td>imp@FreeBSD.org</td><td>A devd
     prototype to manage the insertion and removal of devices (usb,
     firewire, pccard, etc..) from the system.</td></tr>
 
   <tr>
   <td>KDE / GNOME</td><td>Unknown after GCC upgrade</td><td>ports@FreeBSD.org</td>
   <td>Working KDE and GNOME packages are a requirement for 5.0
   RELEASE.  Before the recent GCC upgrade, there were problems
   building parts of KDE.</td>
   </tr>
 
   <tr>
   <td>TrustedBSD MAC Framework system call interface</td>
-    <td>Personal branch: in progress</td><td>rwatson@FreeBSD.org</td>
+    <td>Perforce rwatson_macnewapi: in progress</td>
+    <td>rwatson@FreeBSD.org</td>
     <td>Revised system call interface supporting extensible label access
       from userland.  This replaces the current temporary API which
       supports only a subset of the available policies and is not
       extensible at run-time.</td>
   </tr>
 
   <tr>
   <td>TrustedBSD MAC Framework userland applications</td>
-    <td>TrustedBSD MAC branch: in progress</td><td>rwatson@FreeBSD.org</td>
+    <td>Perforce trustedbsd_mac: in progress</td>
+    <td>rwatson@FreeBSD.org</td>
     <td>Simple labeling applications including {get,set}[fp]mac(8),
       as well as labeling during the login process.</td>
   </tr>
 
   <tr>
   <td>TrustedBSD MAC Framework documentation</td>
     <td>FreeBSD documentation CVS HEAD: in progress</td>
     <td>chris@FreeBSD.org</td><td>User and developer documentation of
       the new extensible security framework.  Includes guides for live
       deployment, development of policy modules, and implementation
       information.</td>
   </tr>
 
   <tr>
   <td>Port of LOMAC to TrustedBSD MAC Framework</td>
-    <td>TrustedBSD MAC branch: in progress</td><td>green@FreeBSD.org</td>
+    <td>Perforce trustedbsd_mac: in progress</td>
+    <td>green@FreeBSD.org</td>
     <td>Re-implementation of LOMAC to plug in via the MAC framework,
       making it easier to deploy and support, as well as removing
       code duplication in the LOMAC tree to improve maintenance cost.</td>
   </tr>
 
   <tr>
   <td>Switch to GEOM as default storage management framework</td>
     <td>FreeBSD CVS HEAD: in progress</td>
     <td>phk@FreeBSD.org</td><td>Move to using GEOM in the GENERIC
       kernel as the default storage management framework, supporting
       out-of-the-box use of new partiton types, data transforms (such
       as cryptographic swap protection), etc.</td>
   </tr>
 
 </table>
 
 <h3>Desired Features for 5.0-RELEASE</h3>
 
 <table border=1 width="100%">
   <tr><th>Issue</th><th>Status</th><th>Responsible</th><th>Description</th>
       </tr>
 
   <tr>
     <td width="30%">User Documentation for device.hints
     mechanism.</td><td width="10%">--</td><td
     width="10%">freebsd-doc@FreeBSD.org</td><td>We need more
     documentation geared at average users about how to configure
     hardware devices with the new device.hints mechanism.  This
     material should be in the Handbook.</td>
   </tr>
 
   <tr>
   <td>OpenOffice</td><td>--</td><td>ports@FreeBSD.org</td>
   <td>A working OpenOffice port is a strongly desired feature for
   5.0</td>
   </tr>
 
   <tr>
     <td>FireWire Support</td><td>--</td><td>??</td>
     <td>What is the holdup with getting this committed?</td>
   </tr>
 
 </table>
 
     &footer;
 
   </body>
 </html>

Issue	Status	Responsible	Description
5.0 Documentation	--	freebsd-doc	As a minimum, we need to cover the areas where 5.x and 4.x differ in the FAQ and Handbook. This entails marking some areas with "This procedure is specific to 4.X. For more information for 5.x, please see foo(n)" or similar. This needs to happen quickly, to give adequate time fo rthe translation teams to catch up.
devd	Unknown	imp@FreeBSD.org	A devd prototype to manage the insertion and removal of devices (usb, firewire, pccard, etc..) from the system.
KDE / GNOME	Unknown after GCC upgrade	ports@FreeBSD.org	Working KDE and GNOME packages are a requirement for 5.0 RELEASE. Before the recent GCC upgrade, there were problems building parts of KDE.
TrustedBSD MAC Framework system call interface	Personal branch: in progress	rwatson@FreeBSD.org	Perforce rwatson_macnewapi: in progress	rwatson@FreeBSD.org	Revised system call interface supporting extensible label access from userland. This replaces the current temporary API which supports only a subset of the available policies and is not extensible at run-time.
TrustedBSD MAC Framework userland applications	TrustedBSD MAC branch: in progress	rwatson@FreeBSD.org	Perforce trustedbsd_mac: in progress	rwatson@FreeBSD.org	Simple labeling applications including {get,set}[fp]mac(8), as well as labeling during the login process.
TrustedBSD MAC Framework documentation	FreeBSD documentation CVS HEAD: in progress	chris@FreeBSD.org	User and developer documentation of the new extensible security framework. Includes guides for live deployment, development of policy modules, and implementation information.
Port of LOMAC to TrustedBSD MAC Framework	TrustedBSD MAC branch: in progress	green@FreeBSD.org	Perforce trustedbsd_mac: in progress	green@FreeBSD.org	Re-implementation of LOMAC to plug in via the MAC framework, making it easier to deploy and support, as well as removing code duplication in the LOMAC tree to improve maintenance cost.
Switch to GEOM as default storage management framework	FreeBSD CVS HEAD: in progress	phk@FreeBSD.org	Move to using GEOM in the GENERIC kernel as the default storage management framework, supporting out-of-the-box use of new partiton types, data transforms (such as cryptographic swap protection), etc.
Issue	Status	Responsible	Description
User Documentation for device.hints mechanism.	--	freebsd-doc@FreeBSD.org	We need more documentation geared at average users about how to configure hardware devices with the new device.hints mechanism. This material should be in the Handbook.
OpenOffice	--	ports@FreeBSD.org	A working OpenOffice port is a strongly desired feature for 5.0
FireWire Support	--	??	What is the holdup with getting this committed?