diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index 1ff3f2a3..22f5e091 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -307,7 +307,7 @@
       <!-- named anchors can't contain whitespaces -->
       <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
       <j:if test="${!empty(_sectionName)}">
-          <h2><a name="${_anchorName}">${_sectionName}</a></h2>
+          <a name="${_anchorName}"/><h2>${_sectionName}</h2>
       </j:if>
       <jsl:applyTemplates select="*"/>
     </div>
@@ -319,7 +319,7 @@
       <!-- named anchors can't contain whitespaces -->
       <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
       <j:if test="${!empty(_sectionName)}">
-          <h3><a name="${_anchorName}">${_sectionName}</a></h3>
+          <a name="${_anchorName}"/><h3>${_sectionName}</h3>
       </j:if>
       <jsl:applyTemplates select="*"/>
     </div>
@@ -391,7 +391,7 @@
         <!-- reset row alternation -->
         <j:set var="rowMode" value="" />
         <div class="h3">
-          <h3><a name="Goals">Goals</a></h3>
+          <a name="Goals"/><h3>Goals</h3>
           <table class="bodyTable">
             <thead>
               <tr><th>Goal</th><th>Description</th></tr>
@@ -417,7 +417,7 @@
         <x:element name="tr"><j:whitespace trim="true">
           <x:attribute name="class">${rowMode}</x:attribute>
           <j:set var="_goalName"><x:expr select="./name" /></j:set>
-          <td style="width:20%"><a name="${_goalName}">${_goalName}</a></td>
+          <td style="width:20%"><a name="${_goalName}"/>${_goalName}</td>
           <td ><jsl:applyTemplates select="description" /></td>
 </j:whitespace></x:element>
       </jsl:template>   
diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index a1b95137..5f2f8f77 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -99,7 +99,7 @@
           #else
           <td>$!developer.name</td>
           #end
-          <td><a name="$!developer.id">$!developer.id</a></td>
+          <td><a name="$!developer.id"/>$!developer.id</td>
           <td><a href="mailto:$!developer.email">$!developer.email</a></td>
           <td>$!developer.organization</td>
           <td>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index f59e64fd..ca3cd220 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPXDOC-63">make anchor tags not wrap text, but sit in front of it</action>
       <action dev="brett" type="fix" due-to="Chad McHenry" issue="MPXDOC-78">indent nested menus in navigation</action>
       <action dev="brett" type="fix">remove changes-report.xml which was generating over the top of the actual report. This information already exists in the changes plugin documentation.</action>
       <action dev="brett" type="fix" issue="MPXDOC-82">fix processing of a href links</action>