diff --git a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
index 0abb9547..112a95d2 100644
--- a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
+++ b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
@@ -131,10 +131,10 @@ public class CodeTransform implements Serializable
 
     /**
      * Specify the only characters that are allowed in a URI besides alpha and
-     * numeric characters.
+     * numeric characters. Refer RFC2396 - http://www.ietf.org/rfc/rfc2396.txt
      */
-    public final static char[] VALID_URI_CHARS = {'?', '+', '%', '&', ':', '/', '.', '@', '_'};
-
+    public final static char[] VALID_URI_CHARS = {'?', '+', '%', '&', ':', '/', '.', '@', '_', ';', '=', '$', ',', '-', '!', '~', '*', '\'', '(', ')'};
+    
     private Hashtable reservedWords = new Hashtable();
     private boolean inMultiLineComment = false;
     private boolean inJavadocComment = false;