diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index d01e1389436..fbdc9880c5c 100644
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -2796,14 +2796,20 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
   } break;
   case Intrinsic::memcpy:
   case Intrinsic::memmove:
-  case Intrinsic::memset:
-    Assert1(isa<ConstantInt>(CI.getArgOperand(3)),
+  case Intrinsic::memset: {
+    ConstantInt *AlignCI = dyn_cast<ConstantInt>(CI.getArgOperand(3));
+    Assert1(AlignCI,
             "alignment argument of memory intrinsics must be a constant int",
             &CI);
+    const APInt &AlignVal = AlignCI->getValue();
+    Assert1(AlignCI->isZero() || AlignVal.isPowerOf2(),
+            "alignment argument of memory intrinsics must be a power of 2",
+            &CI);
     Assert1(isa<ConstantInt>(CI.getArgOperand(4)),
             "isvolatile argument of memory intrinsics must be a constant int",
             &CI);
     break;
+  }
   case Intrinsic::gcroot:
   case Intrinsic::gcwrite:
   case Intrinsic::gcread:
diff --git a/test/Verifier/memcpy.ll b/test/Verifier/memcpy.ll
new file mode 100644
index 00000000000..bd168cc953c
--- /dev/null
+++ b/test/Verifier/memcpy.ll
@@ -0,0 +1,9 @@
+; RUN: not opt -verify < %s 2>&1 | FileCheck %s
+
+; CHECK: alignment argument of memory intrinsics must be a power of 2 
+
+define void @foo(i8* %P, i8* %Q) {
+  call void @llvm.memcpy.p0i8.p0i8.i32(i8* %P, i8* %Q, i32 4, i32 3, i1 false)
+  ret void
+}
+declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, i1) nounwind