diff --git a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
index 065dfa27e..6db1f6686 100644
--- a/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_all_tags_runme.java
@@ -111,10 +111,10 @@ public class doxygen_translate_all_tags_runme {
     		" Warning: This is senseless! \n" +
     		" This will only appear in XML \n" +
     		" Here goes test of symbols: \n" +
-    		" $ @ \\ & ~ < > # % \" . :: \n" +
+    		" $ @ \\ &amp; ~ &lt; &gt; # % &quot; . :: \n" +
     		" And here goes simple text \n" +
     		"");
     // and ask the parser to check comments for us
     System.exit(parser.check(wantedComments));
   }
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/java/doxygen_translate_runme.java b/Examples/test-suite/java/doxygen_translate_runme.java
index cfd62d79c..8aa80a6ed 100644
--- a/Examples/test-suite/java/doxygen_translate_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_runme.java
@@ -138,7 +138,7 @@ public class doxygen_translate_runme {
     		" Warning: This is senseless! \n" +
     		" \n" +
     		" Here goes test of symbols: \n" +
-    		" $ @ \\ & ~ < > # % \" . :: \n" +
+    		" $ @ \\ &amp; ~ &lt; &gt; # % &quot; . :: \n" +
     		" \n" +
     		" And here goes simple text \n" +
     		" \n" +
@@ -146,4 +146,4 @@ public class doxygen_translate_runme {
     // and ask the parser to check comments for us
     System.exit(parser.check(wantedComments));
   }
-}
\ No newline at end of file
+}
diff --git a/Source/DoxygenTranslator/src/JavaDocConverter.cpp b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
index 8f6725f5c..636d49ebf 100644
--- a/Source/DoxygenTranslator/src/JavaDocConverter.cpp
+++ b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
@@ -36,13 +36,13 @@ void JavaDocConverter::fillStaticTables() {
   tagHandlers["$"] = make_pair(&JavaDocConverter::handleTagChar, "");
   tagHandlers["@"] = make_pair(&JavaDocConverter::handleTagChar, "");
   tagHandlers["\\"] = make_pair(&JavaDocConverter::handleTagChar, "");
-  tagHandlers["<"] = make_pair(&JavaDocConverter::handleTagChar, "");
-  tagHandlers[">"] = make_pair(&JavaDocConverter::handleTagChar, "");
-  tagHandlers["&"] = make_pair(&JavaDocConverter::handleTagChar, "");
+  tagHandlers["<"] = make_pair(&JavaDocConverter::handleTagChar, "&lt;");
+  tagHandlers[">"] = make_pair(&JavaDocConverter::handleTagChar, "&gt;");
+  tagHandlers["&"] = make_pair(&JavaDocConverter::handleTagChar, "&amp;");
   tagHandlers["#"] = make_pair(&JavaDocConverter::handleTagChar, "");
   tagHandlers["%"] = make_pair(&JavaDocConverter::handleTagChar, "");
   tagHandlers["~"] = make_pair(&JavaDocConverter::handleTagChar, "");
-  tagHandlers["\""] = make_pair(&JavaDocConverter::handleTagChar, "");
+  tagHandlers["\""] = make_pair(&JavaDocConverter::handleTagChar, "&quot;");
   tagHandlers["."] = make_pair(&JavaDocConverter::handleTagChar, "");
   tagHandlers["::"] = make_pair(&JavaDocConverter::handleTagChar, "");
   // these commands are stripped out