diff --git a/core/org.eclipse.cdt.ui/doxygenTags.csv b/core/org.eclipse.cdt.ui/doxygenTags.csv
index 8403e5d3ef4..65a7071e1c4 100644
--- a/core/org.eclipse.cdt.ui/doxygenTags.csv
+++ b/core/org.eclipse.cdt.ui/doxygenTags.csv
@@ -15,6 +15,8 @@ category,,
 class,,
 code,,
 cond,,
+copybrief,,
+copydetails,,
 copydoc,,
 date,,
 def,,
@@ -46,8 +48,11 @@ exception,,
 f$,,
 f[,,
 f],,
+f{,,
+f},,
 file,,
 fn,,
+headerfile,,
 hideinitializer,,
 htmlinclude,,
 htmlonly,,
@@ -66,6 +71,7 @@ line,,
 link,,
 mainpage,,
 manonly,,
+memberof,,
 msc,,
 n,,
 name,,
@@ -81,8 +87,14 @@ paragraph,,
 param,,
 post,,
 pre,,
+private,,
+privatesection,,
 property,,
+protected,,
+protectedsection,,
 protocol,,
+public,,
+publicsection,,
 ref,,
 relates,,
 relatesalso,,
@@ -103,14 +115,24 @@ subsubsection,,
 test,,
 throw,,
 todo,,
+tparam,,
 typedef,,
 union,,
 until,,
 var,,
 verbatim,,
 verbinclude,,
-version,,
+version,Starts a paragraph where one or more version strings may be entered.,
 warning,,
 weakgroup,,
 xmlonly,,
 xrefitem,,
+&,,
+@,,
+\,,
+~,,
+<,,
+>,,
+#,,
+%,,
+",,
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java
index adeda85de10..1ae0336cb9b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenHelper.java
@@ -54,7 +54,7 @@ public class DoxygenHelper extends AbstractPreferenceInitializer {
 				for(String line= br.readLine(); line!=null; line= br.readLine()) {
 					content.append(line+"\n"); //$NON-NLS-1$
 				}
-				String[] values= content.toString().split("(\\s)*,(\\s)*"); //$NON-NLS-1$
+				String[] values= (content.toString()+"dummy-for-split").split("(\\s)*,(\\s)*"); //$NON-NLS-1$ //$NON-NLS-2$
 				
 				for(int i=0; i+1<values.length; i+=2) {
 					temp.add(new GenericDocTag(values[i], values[i+1]));