diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0790df5c25a..87df9b17349 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-20  Leo Liu  <sdl.web@gmail.com>
+
+	* progmodes/cc-langs.el (c-symbol-start): Include char _ (bug#11986).
+
 2012-07-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* userlock.el, emacs-lisp/map-ynp.el: Declare part of `emacs' package.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 493f3db0961..78be8ac2cc4 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -578,7 +578,7 @@ keyword.  It's unspecified how far it matches.	Does not contain a \\|
 operator at the top level."
   t    (concat "[" c-alpha "_]")
   java (concat "[" c-alpha "_@]")
-  objc (concat "[" c-alpha "@]")
+  objc (concat "[" c-alpha "_@]")
   pike (concat "[" c-alpha "_`]"))
 (c-lang-defvar c-symbol-start (c-lang-const c-symbol-start))