diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
index 9efebfa040..0b76b92a49 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/XmlDoc.xshd
@@ -43,6 +43,8 @@
 					<Word>term</Word>
 					<Word>description</Word>
 					<Word>listheader</Word>
+					<Word>typeparam</Word>
+					<Word>typeparamref</Word>
 				</Keywords>
 			</RuleSet>
 		</Span>
diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs
index 31a54fb519..ad8e702e7c 100644
--- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs
+++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CommentCompletionItemProvider.cs
@@ -31,7 +31,9 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion
 			new string[] {"see cref=\"\"", "A reference to a member"},
 			new string[] {"seealso cref=\"\"", "A reference to a member in the seealso section"},
 			new string[] {"summary", "A summary of the object"},
-			new string[] {"value", "A description of a property"}
+			new string[] {"value", "A description of a property"},
+			new string[] {"typeparam name=\"\"", "A description for a type parameter"},
+			new string[] {"typeparamref name=\"\"", "A reference to a type parameter"}
 		};
 		
 		public override ICompletionItemList GenerateCompletionList(ITextEditor editor)