diff --git a/www/html/status.html b/www/html/status.html
index d14c9b5..1524133 100644
--- a/www/html/status.html
+++ b/www/html/status.html
@@ -166,11 +166,9 @@
 <h2>Policy Conversion</h2>
 <p>
 This phase of reference policy development involves the conversion of policies
-from the example strict policy.  Please use the current NSA example policy
+from the example policy.  Please use the current NSA example policy
 in <a href="http://cvs.sourceforge.net/viewcvs.py/selinux/nsa/selinux-usr/policy/">
 NSA SourceForge CVS</a>.
-We ask that modules that are in the targeted policy be given the first priority,
-and then modules in the strict policy but not in targeted policy given second priority.
 For those who wish to contribute, here is a listing of modules which need to be
 converted:
 </p>
@@ -190,11 +188,6 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>audio-entropy</td>
-      <td>audio-entropyd.te audio-entropyd.fc</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>authbind</td>
       <td>authbind.te authbind.fc</td>
       <td></td>
@@ -205,31 +198,11 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>bonobo +</td>
-      <td>bonobo.te bonobo.fc bonobo_macros.te</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>calamaris</td>
-      <td>calabaris.te calamaris.fc</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>cipe</td>
-      <td>ciped.te ciped.fc</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>courier</td>
       <td>courier.te courier.fc</td>
       <td></td>
     </tr>
     <tr>
-      <td>dante</td>
-      <td>dante.te dante.fc</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>dcc</td>
       <td>dcc.te dcc.fc</td>
       <td></td>
@@ -245,23 +218,8 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>dpkg</td>
-      <td>dpkg.te dpkg.fc</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>ethereal +</td>
-      <td>ethereal.te ethereal.fc ethereal_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
-      <td>evolution +</td>
-      <td>evolution.te evolution.fc evolution_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
-      <td>fontconfig +</td>
-      <td>fontconfig.te fontconfig.fc</td>
+      <td>fontconfig *</td>
+      <td>fontconfig.te fontconfig.fc fontconfig_macros.te</td>
       <td>Tresys</td>
     </tr>
     <tr>
@@ -270,23 +228,13 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>gconf +</td>
-      <td>gconf.te gconf.fc gconf_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
-      <td>games +</td>
-      <td>games.te games.fc games_domain.te</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>gift</td>
       <td>gift.te gift.fc gift_macros.te</td>
       <td></td>
     </tr>
     <tr>
-      <td>gnome +</td>
-      <td>gnome.te gnome.fc gnome_macros.te gnome_vfs.te gnome_vfs.fc gnome_vfs_macros.te gnome-pty-helper.te gnome-pty-helper.fc gph_macros.te</td>
+      <td>gnome *</td>
+      <td>gnome.te gnome.fc gnome_macros.te gnome_vfs.te gnome_vfs.fc gnome_vfs_macros.te gnome-pty-helper.te gnome-pty-helper.fc gph_macros.te bonobo.te bonobo.fc bonobo_macros.te gconf.te gconf.fc gconf_macros.te orbit.te orbit.fc orbit_macros.te</td>
       <td>Tresys</td>
     </tr>
     <tr>
@@ -320,26 +268,6 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>mozilla +</td>
-      <td>mozilla.te mozilla.fc mozilla_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
-      <td>mplayer +</td>
-      <td>mplayer.te mplayer.fc mplayer_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
-      <td>nagios</td>
-      <td>nagios.te nagios.fc nrpe.te nrpe.fc</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>nessus</td>
-      <td>nessusd.te nessusd.fc</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>nsd</td>
       <td>nsd.te nsd.fc</td>
       <td></td>
@@ -360,11 +288,6 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>orbit +</td>
-      <td>orbit.te orbit.fc orbit_macros.te</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>perdition</td>
       <td>perdition.te perdition.fc</td>
       <td></td>
@@ -375,11 +298,6 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>pxe</td>
-      <td>pxe.te pxe.fc</td>
-      <td></td>
-    </tr>
-    <tr>
       <td>pyzor</td>
       <td>pyzor.te pyzor.fc pyzor_macros.te</td>
       <td></td>
@@ -395,11 +313,6 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>rhgb +</td>
-      <td>rhgb.te rhgb.fc rhgb_macros.te</td>
-      <td>Tresys</td>
-    </tr>
-    <tr>
       <td>rssh</td>
       <td>rssh.te rssh.fc rssh_macros.te</td>
       <td></td>
@@ -410,12 +323,7 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>snort</td>
-      <td>snort.te snort.fc</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>sound-server +</td>
+      <td>sound-server</td>
       <td>sound-server.te sound-server.fc</td>
       <td></td>
     </tr>
@@ -450,7 +358,7 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td>vmware +</td>
+      <td>vmware *</td>
       <td>vmware.te vmware.fc vmware_macros.te</td>
       <td>Tresys</td>
     </tr>
@@ -470,10 +378,7 @@ converted:
       <td></td>
     </tr>
     <tr>
-      <td colspan="3">(*) Modules in the Fedora targeted policy</td>
-    </tr>
-    <tr>
-      <td colspan="3">(+) Modules in the Fedora strict policy</td>
+      <td colspan="3">(*) Modules in the Fedora strict policy</td>
     </tr>
   </tbody>
 </table>
diff --git a/www/publish.sh b/www/publish.sh
index ad0366f..a5b77de 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -2,5 +2,5 @@
 
 # This will 'publish' the reference policy website.
 
-cp ../refpolicy/Changelog html/Changelog.txt
+#cp ../refpolicy/Changelog html/Changelog.txt
 rsync -rv --exclude .svn . shell.sf.net:/home/groups/s/se/serefpolicy/htdocs