diff --git a/src/ChangeLog b/src/ChangeLog
index abd373dbc3e..07c707eacdc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* character.c (Fcharacterp): Don't advertise optional ignored
+	argument. (Bug#4026)
+
 2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* keymap.c (syms_of_keymap): Clarify that "modifier" is "modifier
diff --git a/src/character.c b/src/character.c
index 7fc5d647ff5..8e9b3e3775e 100644
--- a/src/character.c
+++ b/src/character.c
@@ -258,7 +258,8 @@ multibyte_char_to_unibyte_safe (int c)
 }
 
 DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
-       doc: /* Return non-nil if OBJECT is a character.  */)
+       doc: /* Return non-nil if OBJECT is a character.
+usage: (characterp OBJECT)  */)
   (Lisp_Object object, Lisp_Object ignore)
 {
   return (CHARACTERP (object) ? Qt : Qnil);