Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -6217,6 +6217,16 @@
       Features["transactional-execution"] = true;
       Features["vector"] = true;
     }
+
+    // Abort if -fzvector is given without the vector facility.
+    if (!Features["vector"] &&
+        std::find(FeaturesVec.begin(), FeaturesVec.end(), "+vector") !=
+        FeaturesVec.end()) {
+      Diags.Report(diag::err_opt_not_valid_with_opt)
+        << std::string("-target-cpu " + CPU.str())
+        << "-target-feature +vector";
+    }
+    
     return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
   }
 
Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -1587,15 +1587,14 @@
 static void getSystemZTargetFeatures(const ArgList &Args,
                                      std::vector<const char *> &Features) {
   // -m(no-)htm overrides use of the transactional-execution facility.
-  if (Arg *A = Args.getLastArg(options::OPT_mhtm, options::OPT_mno_htm)) {
-    if (A->getOption().matches(options::OPT_mhtm))
-      Features.push_back("+transactional-execution");
-    else
-      Features.push_back("-transactional-execution");
-  }
-  // -m(no-)vx overrides use of the vector facility.
-  if (Arg *A = Args.getLastArg(options::OPT_mvx, options::OPT_mno_vx)) {
-    if (A->getOption().matches(options::OPT_mvx))
+  AddTargetFeature(Args, Features, options::OPT_mhtm, options::OPT_mno_htm,
+                   "transactional-execution");
+  
+  // -m(no-)vx and -fzvector overrides use of the vector facility.
+  if (Arg *A = Args.getLastArg(options::OPT_mvx, options::OPT_mno_vx,
+                               options::OPT_fzvector)) {
+    if (A->getOption().matches(options::OPT_mvx) ||
+        A->getOption().matches(options::OPT_fzvector))
       Features.push_back("+vector");
     else
       Features.push_back("-vector");
Index: test/Driver/systemz-fzvector.cpp
===================================================================
--- /dev/null
+++ test/Driver/systemz-fzvector.cpp
@@ -0,0 +1,29 @@
+//// Check that user can only specify +vector with z13.
+
+// XFAIL: *
+// FIXME: this test case is not functioning
+
+// RUN: %clang -S -target s390x-linux -march=z13 -fzvector %s  -o %t.o -v 2>&1 | FileCheck -check-prefix=CHECK-VECTOR-Z13 %s
+// CHECK-VECTOR-Z13: -target-feature +vector
+// CHECK-VECTOR-Z13-NOT: error: option
+
+// RUN: %clang -S -emit-llvm -O3 -target s390x-linux -march=zEC12 -fzvector %s -o %t.o -v 2>&1 | FileCheck -check-prefix=CHECK-VECTOR-ZEC12 %s
+// CHECK-VECTOR-ZEC12: -target-feature +vector
+// CHECK-VECTOR-ZEC12: error: option
+
+// RUN: %clang -S -target s390x-linux -march=z196 -fzvector %s -o %t.o -v 2>&1 | FileCheck -check-prefix=CHECK-VECTOR-Z196 %s
+// CHECK-VECTOR-Z196: -target-feature +vector
+// CHECK-VECTOR-Z196: error: option
+
+// RUN: %clang -S -target s390x-linux -march=z10 -fzvector %s -o %t.o -v 2>&1 | FileCheck -check-prefix=CHECK-VECTOR-Z10 %s
+// CHECK-VECTOR-Z10: -target-feature +vector
+// CHECK-VECTOR-Z10: error: option
+
+// RUN: %clang -S -target s390x-linux -fzvector %s -o %t.o -v 2>&1 | FileCheck -check-prefix=CHECK-VECTOR-GENERIC %s
+// CHECK-VECTOR-GENERIC: -target-feature +vector
+// CHECK-VECTOR-GENERIC: error: option
+
+
+int foo(int x) {
+  return x;
+};