diff --git a/Examples/test-suite/doxygen_translate.i b/Examples/test-suite/doxygen_translate.i
index ba787a140..43d01108f 100644
--- a/Examples/test-suite/doxygen_translate.i
+++ b/Examples/test-suite/doxygen_translate.i
@@ -220,7 +220,7 @@ int htmlFunction(int a, float b)
  * ‘
  * ’
  * “
- * &rdaquo;
+ * ”
  * –
  * —
  *  
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.cpp b/Source/DoxygenTranslator/src/DoxygenParser.cpp
index b514465ac..80bd80876 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenParser.cpp
@@ -1322,7 +1322,7 @@ void DoxygenParser::tokenizeDoxygenComment(const std::string &doxygenComment,
 
     while (pos != string::npos) {
       // find the end of the word
-      size_t doxyCmdOrHtmlTagPos = line.find_first_of("\\@< \t", pos);
+      size_t doxyCmdOrHtmlTagPos = line.find_first_of("\\@<& \t", pos);
       if (doxyCmdOrHtmlTagPos != pos) {
         // plain text found
         m_tokenList.push_back(Token(PLAINSTRING,
diff --git a/Source/DoxygenTranslator/src/JavaDocConverter.cpp b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
index 44bd62016..86966afb7 100644
--- a/Source/DoxygenTranslator/src/JavaDocConverter.cpp
+++ b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
@@ -193,29 +193,29 @@ void JavaDocConverter::fillStaticTables() {
   tagHandlers["<var"    ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<var"    );
 
   // HTML entities
-  tagHandlers["&copy" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&copy");
-  tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&trade");
-  tagHandlers["&reg"  ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&reg");
-  tagHandlers["&lt"   ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&lt");
-  tagHandlers["&gt"   ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&gt");
-  tagHandlers["&amp"  ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&amp");
-  tagHandlers["&apos" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&apos");
-  tagHandlers["&quot" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&quot");
-  tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&lsquo");
-  tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rsquo");
-  tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ldquo");
-  tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rdquo");
-  tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ndash");
-  tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&mdash");
-  tagHandlers["&nbsp" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&nbsp");
-  tagHandlers["&times"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&times");
-  tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&minus");
-  tagHandlers["&sdot" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&sdot");
-  tagHandlers["&sim"  ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&sim");
-  tagHandlers["&le"   ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&le");
-  tagHandlers["&ge"   ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&ge");
-  tagHandlers["&larr" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&larr");
-  tagHandlers["&rarr" ] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "&rarr");
+  tagHandlers["&copy" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&copy");
+  tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&trade");
+  tagHandlers["&reg"  ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&reg");
+  tagHandlers["&lt"   ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lt");
+  tagHandlers["&gt"   ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&gt");
+  tagHandlers["&amp"  ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&amp");
+  tagHandlers["&apos" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&apos");
+  tagHandlers["&quot" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&quot");
+  tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lsquo");
+  tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rsquo");
+  tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ldquo");
+  tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rdquo");
+  tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ndash");
+  tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&mdash");
+  tagHandlers["&nbsp" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&nbsp");
+  tagHandlers["&times"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&times");
+  tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&minus");
+  tagHandlers["&sdot" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sdot");
+  tagHandlers["&sim"  ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sim");
+  tagHandlers["&le"   ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&le");
+  tagHandlers["&ge"   ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ge");
+  tagHandlers["&larr" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&larr");
+  tagHandlers["&rarr" ] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rarr");
 }
 
 
@@ -367,7 +367,7 @@ void JavaDocConverter::handleDoxyHtmlTag(DoxygenEntity& tag, std::string& transl
 }
 
 
-void JavaDocConverter::handleHtmlEntity(DoxygenEntity& tag, std::string& translatedComment, std::string &arg) {
+void JavaDocConverter::handleHtmlEntity(DoxygenEntity&, std::string& translatedComment, std::string &arg) {
     // html entities can be preserved for Java
     translatedComment += arg + ';';
 }