diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp
index fa42b638e074..b7d8e2704a43 100644
--- a/clang/lib/CodeGen/Mangle.cpp
+++ b/clang/lib/CodeGen/Mangle.cpp
@@ -1391,9 +1391,11 @@ void CXXNameMangler::mangleIntegerLiteral(QualType T,
     // Boolean values are encoded as 0/1.
     Out << (Value.getBoolValue() ? '1' : '0');
   } else {
-    if (Value.isNegative())
+    if (Value.isSigned() && Value.isNegative()) {
       Out << 'n';
-    Value.abs().print(Out, false);
+      Value.abs().print(Out, true);
+    } else
+      Value.print(Out, Value.isSigned());
   }
   Out << 'E';
 
diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp
index 9d153b59b016..54a4060352e0 100644
--- a/clang/test/CodeGenCXX/mangle.cpp
+++ b/clang/test/CodeGenCXX/mangle.cpp
@@ -489,3 +489,10 @@ namespace test11 {
   // CHECK: @_ZN6test111A1fEz
   void A::f(...) { }
 }
+
+namespace test12 {
+
+  // CHECK: _ZN6test121fENS_1AILt33000EEE
+  template <unsigned short> struct A { };
+  void f(A<33000>) { }
+}
\ No newline at end of file