diff --git a/cvstrac/cvstrac.patch b/cvstrac/cvstrac.patch
index eb86759131..eafd26224f 100644
--- a/cvstrac/cvstrac.patch
+++ b/cvstrac/cvstrac.patch
@@ -338,30 +338,6 @@ Index: ticket.c
      az = db_query("SELECT '', '' UNION ALL "
              "SELECT name, value  FROM enums WHERE type='subsys'");
      if( az[0] && az[1] && az[2] ){
-@@ -823,7 +825,11 @@
-   @ </tr>
-   @ <tr>
-   @   <td align="right">Assigned&nbsp;To:</td>
-+  if( strchr(az[10], '@') && g.isAnon ){
-+  @   <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i>&nbsp;</td>
-+  } else {
-   @   <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[6])&nbsp;</b></td>
-+  }
-   @ <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-   @   <td align="right">Derived From:</td>
-   @   <td bgcolor="%h(BG3)" class="bkgnd3"><b>
-@@ -838,7 +844,11 @@
-   @ </tr>
-   @ <tr>
-   @   <td align="right">Creator:</td>
-+  if( strchr(az[10], '@') && !g.okWrite ){
-+  @   <td bgcolor="%h(BG3)" class="bkgnd3"><i>undisclosed</i>&nbsp;</td>
-+  } else {
-   @   <td bgcolor="%h(BG3)" class="bkgnd3"><b>%h(az[10])&nbsp;</b></td>
-+  }
-   if( g.okWrite && !g.isAnon ){
-     @ <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-     @   <td align="right">Contact:</td>
 @@ -1323,7 +1333,7 @@
    @ <nobr>
    @ Assigned To: 
@@ -391,37 +367,6 @@ Index: ticket.c
    bprintf(zPage,sizeof(zPage),"%d",tn);
    doPreview = P("pre")!=0;
    doSubmit = P("submit")!=0;
-@@ -1475,6 +1487,10 @@
-       strftime(zDate, sizeof(zDate), "%Y-%b-%d %H:%M:%S", pTm);
-       if( isspace(zText[0]) && isspace(zText[1]) ) zSpacer = "\n\n";
-       if( zOrig[0]==0 ) zHLine = "";
-+      if ( strchr(g.zUser,'@') )
-+          zNew = mprintf("%s_%s:_%s%s",
-+                         zHLine, zDate, zSpacer, zText);
-+      else
-       zNew = mprintf("%s_%s by %s:_%s%s",
-                      zHLine, zDate, g.zUser, zSpacer, zText);
-       db_execute(
-@@ -1586,6 +1602,9 @@
-     @ Change <i>%h(zField)</i> from "%h(zOld)" to "%h(zNew)"
-   }
- 
-+  if (strchr(zUser, '@') && g.isAnon)
-+  @ by <i>undisclosed</i> on %h(zDate)
-+  else
-   @ by %h(zUser) on %h(zDate)
- 
-   if( isLast && ok_to_undo_change(date, zUser) ){
-@@ -1764,6 +1783,9 @@
-   common_header("Ticket #%d History", tn);
-   @ <h2>Ticket %d(tn) History: %h(az[0])</h2>
-   @ <ol>
-+  if (strchr(az[2], '@') && g.isAnon)
-+  @ <li>Created %h(zDate) by <i>undisclosed</i></li>
-+  else
-   @ <li>Created %h(zDate) by %h(az[2])</li>
- 
-   /* Grab various types of ticket activities from the db.
 Index: timeline.c
 --- timeline.c.orig	2006-05-26 16:20:28 +0200
 +++ timeline.c	2006-09-28 17:43:45 +0200
@@ -435,24 +380,3 @@ Index: timeline.c
    /* patchsets are raw output based one what are supposed to be unchanging file
    ** revisions.
    */
-Index: wiki.c
---- wiki.c.orig	2006-05-26 16:20:28 +0200
-+++ wiki.c	2006-09-28 17:43:45 +0200
-@@ -310,12 +310,17 @@
- 
- char *format_user(const char* zUser){
-   if( zUser!=0 ){
-+  if( strchr(zUser, '@') && !g.okWrite ){
-+      return mprintf("<i>undisclosed</i>");
-+  }
-+  else {
-     if( g.okRdWiki && is_user_page(zUser) ){
-       return mprintf("<a href=\"wiki?p=%t\">%h</a>", zUser, zUser);
-     }else{
-       return mprintf("%h",zUser);
-     }
-   }
-+  }
-   return 0;
- }
-