diff --git a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.h b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.h
--- a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.h
+++ b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.h
@@ -89,6 +89,8 @@
     
 private:
     const QScopedPointer<class AbstractDeclarationNavigationContextPrivate> d;
+    
+    QString parseDoxygenCommands(const QString& comment);
 };
 
 }
diff --git a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
--- a/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
+++ b/kdevplatform/language/duchain/navigation/abstractdeclarationnavigationcontext.cpp
@@ -323,6 +323,7 @@
         // let's protect them from being removed completely
         comment.replace(QRegExp(QStringLiteral("<br */>")), QStringLiteral("\n"));
         comment = comment.toHtmlEscaped();
+        comment = parseDoxygenCommands(comment);
         comment.replace(QLatin1Char('\n'), QLatin1String("<br />")); //Replicate newlines in html
       }
       modifyHtml() += commentHighlight(comment);
@@ -784,4 +785,57 @@
   return details;
 }
 
+QString AbstractDeclarationNavigationContext::parseDoxygenCommands(const QString& comment)
+{
+  QStringList parsedLines;
+  
+  for( QString line : comment.split('\n') ) {
+    line = line.trimmed();
+
+    line.replace(QRegExp("^(@param|\\\\param)\\[(in|out|in,out)\\] ([\\w]+) (.*)"), "\\2 <strong>\\3</strong>: <em>\\4</em>");
+    
+    line.replace(QRegExp("^(@param|\\\\param) ([\\w]+) (.*)"), "<strong>\\2</strong>: <em>\\3</em>");
+    
+    line.replace(QRegExp("^(@return|\\\\return|@returns|\\\\returns) (.*)"), "<strong>Returns</strong> <em>\\2</em>");
+    
+    line.replace(QRegExp("^(@brief|\\\\brief) "), "");
+    
+    line.replace(QRegExp("(@see|\\\\see|@sa|\\\\sa) "), "<strong>See also:</strong><br />");
+    
+    line.replace(QRegExp("(@since|\\\\since) "), "<strong>Since</strong> ");
+    
+    line.replace(QRegExp("(@note|\\\\note) "), "<strong>Note:</strong> ");
+    
+    line.replace(QRegExp("(@todo|\\\\todo) "), "<strong>TODO:</strong> ");
+    
+    line.replace(QRegExp("(@bug|\\\\bug) "), "<strong>BUG:</strong> ");
+    
+    line.replace(QRegExp("(<em>.*)\\\\(a|e|em) ([\\w]+)(.*</em>)"), "\\1</em>\\3<em>\\4");
+    
+    line.replace(QRegExp("\\\\(a|e|em) ([\\w]+)"), "<em>\\2</em>");
+    
+    line.replace(QRegExp("\\\\(c|p) ([\\w]+)"), "<tt>\\2</tt>");
+    
+    line.replace(QRegExp("(@code|\\\\code)(\\{[^\\}]*\\})?"), "<pre><tt>");
+    
+    line.replace(QRegExp("(@endcode|\\\\endcode)"), "</tt></pre>");
+    
+    line.replace(QRegExp("\\\\f\\$(((?!\\\\f\\$).)*)\\\\f\\$"), "<tt>\\1</tt>");
+    
+    line.replace(QRegExp("\\\\f\\["), "<pre><tt>");
+    line.replace(QRegExp("\\\\f\\]"), "</tt></pre>");
+    
+    line.replace(QRegExp("\\\\f\\{[^\\}]*\\}\\{"), "<pre><tt>");
+    line.replace(QRegExp("\\\\f\\}"), "</tt></pre>");
+    
+    line.replace(QRegExp("\\\\([$@\\\\&~<>#%\\\"\\.\\]|::|--|---)"), "\\1");
+    
+    line.replace("\\n", "<br />");
+    
+    parsedLines << line;
+  }
+  
+  return parsedLines.join("<br />");
+}
+
 }