diff --git a/ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs b/ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs
index 33032d02e..0060b71d8 100644
--- a/ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs
+++ b/ICSharpCode.Decompiler/Disassembler/DisassemblerHelpers.cs
@@ -126,7 +126,10 @@ namespace ICSharpCode.Decompiler.Disassembler
 				writer.Write(string.Join(", ", at.Dimensions));
 				writer.Write(']');
 			} else if (type is GenericParameter) {
-				writer.WriteReference(type.Name, type);
+				writer.Write('!');
+				if (((GenericParameter)type).Owner.GenericParameterType == GenericParameterType.Method)
+					writer.Write('!');
+				writer.Write(type.Name);
 			} else if (type is ByReferenceType) {
 				((ByReferenceType)type).ElementType.WriteTo(writer, onlyName, shortName);
 				writer.Write('&');
diff --git a/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs b/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
index 3ae34ffb3..5231b78c1 100644
--- a/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
+++ b/ICSharpCode.Decompiler/Disassembler/ReflectionDisassembler.cs
@@ -123,6 +123,7 @@ namespace ICSharpCode.Decompiler.Disassembler
 			method.ReturnType.WriteTo(output);
 			output.Write(' ');
 			output.Write(DisassemblerHelpers.Escape(method.Name));
+			WriteTypeParameters(output, method);
 			
 			//( params )
 			output.Write(" (");
@@ -331,6 +332,7 @@ namespace ICSharpCode.Decompiler.Disassembler
 			WriteFlags(type.Attributes & ~masks, typeAttributes);
 			
 			output.Write(DisassemblerHelpers.Escape(type.Name));
+			WriteTypeParameters(output, type);
 			output.MarkFoldStart(defaultCollapsed: isInType);
 			output.WriteLine();
 			
@@ -416,6 +418,42 @@ namespace ICSharpCode.Decompiler.Disassembler
 			CloseBlock("End of class " + type.FullName);
 			isInType = oldIsInType;
 		}
+		
+		void WriteTypeParameters(ITextOutput output, IGenericParameterProvider p)
+		{
+			if (p.HasGenericParameters) {
+				output.Write('<');
+				for (int i = 0; i < p.GenericParameters.Count; i++) {
+					if (i > 0)
+						output.Write(", ");
+					GenericParameter gp = p.GenericParameters[i];
+					if (gp.HasReferenceTypeConstraint) {
+						output.Write("class ");
+					} else if (gp.HasNotNullableValueTypeConstraint) {
+						output.Write("valuetype ");
+					}
+					if (gp.HasConstraints) {
+						output.Write('(');
+						for (int j = 0; j < gp.Constraints.Count; j++) {
+							if (j > 0)
+								output.Write(", ");
+							gp.Constraints[j].WriteTo(output, true);
+						}
+						output.Write(") ");
+					}
+					if (gp.HasDefaultConstructorConstraint) {
+						output.Write(".ctor ");
+					}
+					if (gp.IsContravariant) {
+						output.Write('-');
+					} else if (gp.IsCovariant) {
+						output.Write('+');
+					}
+					output.Write(DisassemblerHelpers.Escape(gp.Name));
+				}
+				output.Write('>');
+			}
+		}
 		#endregion
 
 		#region Helper methods