diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index 4cc60f53226ed..84cec02d99628 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -4869,7 +4869,8 @@ def header_include_file : Separate<["-"], "header-include-file">,
 def show_includes : Flag<["--"], "show-includes">,
   HelpText<"Print cl.exe style /showIncludes to stdout">;
 def dependency_filter : Separate<["-"], "dependency-filter">,
-  HelpText<"Filter dependencies with prefix from the dependency output.">;
+  HelpText<"Filter dependencies with prefix from the dependency output.">,
+  MarshallingInfoString<DependencyOutputOpts<"DependencyFilter">>;
 
 //===----------------------------------------------------------------------===//
 // Diagnostic Options
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index ec6287a127365..7337285688383 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -2004,8 +2004,6 @@ static bool ParseDependencyOutputArgsImpl(
     DependencyOutputOptions &Opts, ArgList &Args,
     DiagnosticsEngine &Diags,
     frontend::ActionKind Action, bool ShowLineMarkers) {
-    Opts.DependencyFilter =
-      std::string(Args.getLastArgValue(OPT_dependency_filter));
   Opts.Targets = Args.getAllArgValues(OPT_MT);
 
   unsigned NumErrorsBefore = Diags.getNumErrors();