diff --git a/lib/AST/MicrosoftMangle.cpp b/lib/AST/MicrosoftMangle.cpp
index 40f8730..9cd6bac 100644
--- a/lib/AST/MicrosoftMangle.cpp
+++ b/lib/AST/MicrosoftMangle.cpp
@@ -824,9 +824,13 @@
     switch (TA.getKind()) {
     case TemplateArgument::Null:
       llvm_unreachable("Can't mangle null template arguments!");
-    case TemplateArgument::Type:
-      mangleType(TA.getAsType(), SourceRange());
+    case TemplateArgument::Type: {
+      QualType T = TA.getAsType();
+      if (T.hasQualifiers())
+        Out << "$$C";
+      mangleType(T, SourceRange());
       break;
+    }
     case TemplateArgument::Declaration:
       mangle(cast<NamedDecl>(TA.getAsDecl()), "$1?");
       break;
diff --git a/test/CodeGenCXX/mangle-ms-templates.cpp b/test/CodeGenCXX/mangle-ms-templates.cpp
index d0e8af4..7b7f30b 100644
--- a/test/CodeGenCXX/mangle-ms-templates.cpp
+++ b/test/CodeGenCXX/mangle-ms-templates.cpp
@@ -35,6 +35,18 @@
   c1.method();
 // CHECK: call {{.*}} @"\01?method@?$Class@VTypename@@@@QAEXXZ"
 
+  Class<const Typename> c1_const;
+  Class<volatile Typename> c1_volatile;
+  Class<const volatile Typename> c1_cv;
+  c1_const.method();
+  c1_volatile.method();
+  c1_cv.method();
+// Types with qualifiers have an extra $$C escape when used as template
+// arguments.  Not sure why.
+// CHECK: call {{.*}} @"\01?method@?$Class@$$CBVTypename@@@@QAEXXZ"
+// CHECK: call {{.*}} @"\01?method@?$Class@$$CCVTypename@@@@QAEXXZ"
+// CHECK: call {{.*}} @"\01?method@?$Class@$$CDVTypename@@@@QAEXXZ"
+
   Class<Nested<Typename> > c2;
   c2.method();
 // CHECK: call {{.*}} @"\01?method@?$Class@V?$Nested@VTypename@@@@@@QAEXXZ"