diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td
index 6106342258..195ee92afa 100644
--- a/include/clang/Driver/CC1Options.td
+++ b/include/clang/Driver/CC1Options.td
@@ -46,7 +46,7 @@ def analysis_WarnUninitVals : Flag<"-warn-uninit-values">,
   HelpText<"Warn about uses of uninitialized variables">;
 def analysis_WarnObjCMethSigs : Flag<"-analyzer-check-objc-methodsigs">,
   HelpText<"Warn about Objective-C method signatures with type incompatibilities">;
-def analysis_WarnObjCDealloc : Flag<"-warn-objc-missing-dealloc">,
+def analysis_WarnObjCDealloc : Flag<"-analyzer-check-objc-missing-dealloc">,
   HelpText<"Warn about Objective-C classes that lack a correct implementation of -dealloc">;
 def analysis_WarnObjCUnusedIvars : Flag<"-analyzer-check-objc-unused-ivars">,
   HelpText<"Warn about private ivars that are never used">;
diff --git a/include/clang/Frontend/Analyses.def b/include/clang/Frontend/Analyses.def
index eb7ba92d6b..4052223ce8 100644
--- a/include/clang/Frontend/Analyses.def
+++ b/include/clang/Frontend/Analyses.def
@@ -38,7 +38,7 @@ ANALYSIS(WarnObjCMethSigs, "analyzer-check-objc-methodsigs",
  "Warn about Objective-C method signatures with type incompatibilities",
  ObjCImplementation)
 
-ANALYSIS(WarnObjCDealloc, "warn-objc-missing-dealloc",
+ANALYSIS(WarnObjCDealloc, "analyzer-check-objc-missing-dealloc",
  "Warn about Objective-C classes that lack a correct implementation of -dealloc",
  ObjCImplementation)
  
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index ec1e9a9c8e..c0de62760d 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -707,7 +707,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-analyzer-eagerly-assume");
       CmdArgs.push_back("-analyzer-check-objc-methodsigs");
       // Do not enable the missing -dealloc check.
-      // '-warn-objc-missing-dealloc',
+      // '-analyzer-check-objc-missing-dealloc',
       CmdArgs.push_back("-analyzer-check-objc-unused-ivars");
     }
 
diff --git a/test/Analysis/MissingDealloc.m b/test/Analysis/MissingDealloc.m
index daa6460da8..bfd968a9a1 100644
--- a/test/Analysis/MissingDealloc.m
+++ b/test/Analysis/MissingDealloc.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s -verify
+// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s -verify
 typedef signed char BOOL;
 @protocol NSObject
 - (BOOL)isEqual:(id)object;
diff --git a/test/Analysis/PR2978.m b/test/Analysis/PR2978.m
index a70e34ac78..1ed138e45d 100644
--- a/test/Analysis/PR2978.m
+++ b/test/Analysis/PR2978.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -warn-objc-missing-dealloc %s -verify
+// RUN: %clang_cc1 -analyze -analyzer-experimental-internal-checks -analyzer-check-objc-missing-dealloc %s -verify
 
 // Tests for the checker which checks missing/extra ivar 'release' calls 
 // in dealloc.
diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index 1c856d9a50..60de858349 100755
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -125,7 +125,7 @@ my %AnalysesDefaultEnabled = (
   '-checker-cfref' => 1,
   '-analyzer-check-objc-methodsigs' => 1,
   # Do not enable the missing -dealloc check by default.
-  #  '-warn-objc-missing-dealloc' => 1,
+  #  '-analyzer-check-objc-missing-dealloc' => 1,
   '-analyzer-check-objc-unused-ivars' => 1,
   '-analyzer-check-security-syntactic' => 1
 );