diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td
index fa291a5..1d0390a 100644
--- a/include/clang/Driver/CC1Options.td
+++ b/include/clang/Driver/CC1Options.td
@@ -48,7 +48,7 @@
   HelpText<"Warn about Objective-C method signatures with type incompatibilities">;
 def analysis_WarnObjCDealloc : Flag<"-warn-objc-missing-dealloc">,
   HelpText<"Warn about Objective-C classes that lack a correct implementation of -dealloc">;
-def analysis_WarnObjCUnusedIvars : Flag<"-warn-objc-unused-ivars">,
+def analysis_WarnObjCUnusedIvars : Flag<"-analyzer-check-objc-unused-ivars">,
   HelpText<"Warn about private ivars that are never used">;
 def analysis_CheckerCFRef : Flag<"-checker-cfref">,
   HelpText<"Run the [Core] Foundation reference count checker">;
diff --git a/include/clang/Frontend/Analyses.def b/include/clang/Frontend/Analyses.def
index 0bf603d..d57b226 100644
--- a/include/clang/Frontend/Analyses.def
+++ b/include/clang/Frontend/Analyses.def
@@ -42,7 +42,7 @@
  "Warn about Objective-C classes that lack a correct implementation of -dealloc",
  ObjCImplementation)
  
-ANALYSIS(WarnObjCUnusedIvars, "warn-objc-unused-ivars",
+ANALYSIS(WarnObjCUnusedIvars, "analyzer-check-objc-unused-ivars",
   "Warn about private ivars that are never used", ObjCImplementation)
 
 ANALYSIS(CheckerCFRef, "checker-cfref",
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index be69854..3ee4552 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -708,7 +708,7 @@
       CmdArgs.push_back("-warn-objc-methodsigs");
       // Do not enable the missing -dealloc check.
       // '-warn-objc-missing-dealloc',
-      CmdArgs.push_back("-warn-objc-unused-ivars");
+      CmdArgs.push_back("-analyzer-check-objc-unused-ivars");
     }
 
     // Set the output format. The default is plist, for (lame) historical
diff --git a/test/Analysis/unused-ivars.m b/test/Analysis/unused-ivars.m
index 2ad886f..600f0e2 100644
--- a/test/Analysis/unused-ivars.m
+++ b/test/Analysis/unused-ivars.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fblocks -analyze -warn-objc-unused-ivars %s -verify
+// RUN: %clang_cc1 -fblocks -analyze -analyzer-check-objc-unused-ivars %s -verify
 
 //===--- BEGIN: Delta-debugging reduced headers. --------------------------===//
 
diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index ae9db29..044feea 100755
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -126,7 +126,7 @@
   '-warn-objc-methodsigs' => 1,
   # Do not enable the missing -dealloc check by default.
   #  '-warn-objc-missing-dealloc' => 1,
-  '-warn-objc-unused-ivars' => 1,
+  '-analyzer-check-objc-unused-ivars' => 1,
   '-analyzer-check-security-syntactic' => 1
 );