Index: src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java
===================================================================
--- src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java	(revision 753638)
+++ src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceParserTest.java	(working copy)
@@ -237,11 +237,11 @@
     {
         String result = locateAndParseTestSourceFile( "link" );
 
-        assertContainsLines( result, "begin:link, name: middle\ntext: middle\nend:link" );
-        assertContainsLines( result, "begin:link, name: end\ntext: end\nend:link" );
-        assertContainsLines( result, "begin:link, name: link\ntext: alias\nend:link" );
-        assertContainsLines( result, "begin:link, name: link#anchor\ntext: link#anchor\nend:link" );
-        assertContainsLines( result, "begin:link, name: #simple\ntext: simple\nend:link" );
+        assertContainsLines( result, "begin:link, name: middle.html\ntext: middle\nend:link" );
+        assertContainsLines( result, "begin:link, name: end.html\ntext: end\nend:link" );
+        assertContainsLines( result, "begin:link, name: link.html\ntext: alias\nend:link" );
+        assertContainsLines( result, "begin:link, name: link#anchor.html\ntext: link#anchor\nend:link" );
+        assertContainsLines( result, "begin:link, name: #simple.html\ntext: simple\nend:link" );
         // 3 paragraphs in the input...
         assertEquals( 4, result.split( "end:paragraph\n" ).length );
         // 5 links in the input...
Index: src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java
===================================================================
--- src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java	(revision 753638)
+++ src/main/java/org/apache/maven/doxia/module/confluence/parser/ChildBlocksBuilder.java	(working copy)
@@ -109,11 +109,17 @@
                 case ']':
                     if ( insideLink )
                     {
+                    	boolean addHTMLSuffix = false;
                         String link = text.toString();
 
+                        if (!link.endsWith(".html"))
+                        	if (!link.contains("http"))
+                        			addHTMLSuffix = true;
                         if ( link.indexOf( "|" ) > 0 )
                         {
                             String[] pieces = StringUtils.split( text.toString(), "|" );
+                            if (addHTMLSuffix)
+                            	pieces[1] = pieces[1].concat(".html");
 
                             blocks.add( new LinkBlock( pieces[1], pieces[0] ) );
                         }
@@ -126,6 +132,8 @@
                                 value = link.substring( 1 );
                             }
 
+                            if (addHTMLSuffix)
+                            	link = link.concat(".html");
                             blocks.add( new LinkBlock( link, value ) );
                         }