diff --git a/Sema/SemaChecking.cpp b/Sema/SemaChecking.cpp
index b366a2b..4d2e362 100644
--- a/Sema/SemaChecking.cpp
+++ b/Sema/SemaChecking.cpp
@@ -62,7 +62,7 @@
            diag::err_va_start_used_in_non_variadic_function);
       return true;
     }
-      
+    // FIXME: This isn't correct for methods (results in bogus warning).
     bool SecondArgIsLastNamedArgument = false;
     if (DeclRefExpr *DR = dyn_cast<DeclRefExpr>(Args[1])) {
       if (ParmVarDecl *PV = dyn_cast<ParmVarDecl>(DR->getDecl())) {
diff --git a/Sema/SemaType.cpp b/Sema/SemaType.cpp
index c89018a..a9b8066 100644
--- a/Sema/SemaType.cpp
+++ b/Sema/SemaType.cpp
@@ -366,7 +366,7 @@
     ArgTys.push_back(ArgTy);
   }
   T = Context.getFunctionType(T, &ArgTys[0], ArgTys.size(),
-                              false);
+                              MDecl->isVariadic());
   return T;
 }
 
diff --git a/test/Sema/va-method.m b/test/Sema/va-method.m
new file mode 100644
index 0000000..a8a7053
--- /dev/null
+++ b/test/Sema/va-method.m
@@ -0,0 +1,17 @@
+// RUN: clang -fsyntax-only -verify %s
+
+#include <stdarg.h>
+
+@interface NSObject @end
+@interface XX : NSObject @end
+
+@implementation XX
+- (void)encodeValuesOfObjCTypes:(const char *)types, ... {
+   va_list ap;
+   va_start(ap, types); // expected-warning {{second parameter of 'va_start' not last named argument}}
+   while (*types) ;
+   va_end(ap);
+}
+
+@end
+