diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 4c0542419210c0be2b47e2d46a11d5601cf71ffe..780016a8b869f17112e39a3fd4635729300215c1 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1950,6 +1950,14 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_fno_limit_debug_info);
   Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names);
   Args.AddLastArg(CmdArgs, options::OPT_faltivec);
+
+  // Report and error for -faltivec on anything other then PowerPC.
+  if (const Arg *A = Args.getLastArg(options::OPT_faltivec))
+    if (!(getToolChain().getTriple().getArch() == llvm::Triple::ppc ||
+          getToolChain().getTriple().getArch() == llvm::Triple::ppc64))
+      D.Diag(diag::err_drv_argument_only_allowed_with)
+        << A->getAsString(Args) << "ppc/ppc64";
+
   if (getToolChain().SupportsProfiling())
     Args.AddLastArg(CmdArgs, options::OPT_pg);
 
diff --git a/test/Driver/altivec.cpp b/test/Driver/altivec.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..408c52d5b7ccd0bec1d43720fd12ac1566705bc6
--- /dev/null
+++ b/test/Driver/altivec.cpp
@@ -0,0 +1,12 @@
+// Check that we error when -faltivec is specified on a non-ppc platforms.
+
+// RUN: %clang -arch ppc -faltivec -fsyntax-only %s
+// RUN: %clang -arch ppc64 -faltivec -fsyntax-only %s
+
+// RUN: not %clang -arch i386 -faltivec -fsyntax-only %s
+// RUN: not %clang -arch x86_64 -faltivec -fsyntax-only %s
+// RUN: not %clang -arch armv6 -faltivec -fsyntax-only %s
+// RUN: not %clang -arch armv7 -faltivec -fsyntax-only %s
+// RUN: not %clang -arch mips -faltivec -fsyntax-only %s
+// RUN: not %clang -arch mips64 -faltivec -fsyntax-only %s
+// RUN: not %clang -arch sparc -faltivec -fsyntax-only %s