diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 142d317..18a55e0 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -35,13 +35,17 @@ xml.apache.org subprojects.</p>
       <title>News and events</title>
       <ul>
         <li>
-          <link href="http://apachecon.com/2004/US/">
+<!-- FIXME: wait for a new logo
+          <link href="http://apachecon.com/">
           <img src="http://apache.org/images/ac2004_170x100.gif"
-               alt="apachecon 2004 logo" width="170" height="100"/>
+               alt="apachecon logo" width="170" height="100"/>
           </link>
-          <link href="http://apachecon.com/2004/US/">ApacheCon
-          US 2004</link>
-          (13-17 November 2004). ApacheCon is the conference for all
+-->
+          <link href="http://apachecon.com/">ApacheCon
+          US 2005</link> -
+          Please make plans to join us for the conference in San Diego,
+          California, USA on 10-14 December 2005.
+          ApacheCon is the conference for all
           things Apache. Come along and learn about a range of new
           technologies, meet some Apache folks and share the knowledge.
         </li>
@@ -80,7 +84,7 @@ that could be plugged into any xml parsing, transforming, or processing
 project.  <link href="#java">Read more</link>.</p>
 <p>Directory tree (proposed)</p>
 
-<fixme author="crossley">This needs to be updated to reflect the current tree.
+<fixme author="open">This needs to be updated to reflect the current tree.
 It also needs to go into a section of its own or perhaps a separate document.
 </fixme>