Index: src/site/apt/format.apt
===================================================================
--- src/site/apt/format.apt	(revision 375312)
+++ src/site/apt/format.apt	(working copy)
@@ -577,8 +577,8 @@
 
   <Italic> font. <<Bold>> font. <<<Monospaced>>> font.
 
-  {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. 
-  Link to {{{anchor}showing alternate text}}.
+  An {anchor}. Link to {{#anchor}}. Link to {{http://www.pixware.fr}}.
+  Link to {{{#anchor} anchor showing alternate text}}.
   Link to {{{http://www.pixware.fr}Pixware home page}}.
 
   Force line\
Index: doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
===================================================================
--- doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java	(revision 375312)
+++ doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java	(working copy)
@@ -1071,7 +1071,10 @@
                     }
                     else
                     {
-                        buffer.append( c );
+                        if (!(link && c == '#'))
+                        {
+                            buffer.append( c );
+                        }
                     }
             }
         }
Index: doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
===================================================================
--- doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java	(revision 375312)
+++ doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java	(working copy)
@@ -612,12 +612,8 @@
     {
         if ( !headFlag )
         {
-            if ( name != null && !name.startsWith( "#" ) )
+            if (name != null)
             {
-                write( "<a name=\"#" + name + "\">" );
-            }
-            else
-            {
                 write( "<a name=\"" + name + "\">" );
             }
         }