diff --git a/clang/lib/Driver/ToolChains/ZOS.h b/clang/lib/Driver/ToolChains/ZOS.h
index 50bff099356136..53138306fd4101 100644
--- a/clang/lib/Driver/ToolChains/ZOS.h
+++ b/clang/lib/Driver/ToolChains/ZOS.h
@@ -30,6 +30,8 @@ class LLVM_LIBRARY_VISIBILITY ZOS : public ToolChain {
 
   bool IsIntegratedAssemblerDefault() const override { return true; }
 
+  unsigned GetDefaultDwarfVersion() const override { return 4; }
+
   void addClangTargetOptions(
       const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args,
       Action::OffloadKind DeviceOffloadingKind) const override;
diff --git a/clang/test/Driver/zos-dwarfversion.c b/clang/test/Driver/zos-dwarfversion.c
new file mode 100644
index 00000000000000..53a727102f081c
--- /dev/null
+++ b/clang/test/Driver/zos-dwarfversion.c
@@ -0,0 +1,3 @@
+// RUN: %clang -target s390x-none-zos -g -S -emit-llvm %s -o - | FileCheck %s
+
+// CHECK: !"Dwarf Version", i32 4