diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 116317bc30c..4be07b5921c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	* simple.el (password-word-equivalents): Add "passcode", used for
+	numeric secrets like PINs or RSA tokens.
+
 2014-12-10  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-sh.el (tramp-get-remote-path): Use a login shell in
diff --git a/lisp/simple.el b/lisp/simple.el
index b8b15796a26..c3a8a2d174a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2604,7 +2604,7 @@ which is defined in the `warnings' library.\n")
     t))
 
 (defcustom password-word-equivalents
-  '("password" "passphrase" "pass phrase"
+  '("password" "passcode" "passphrase" "pass phrase"
     ; These are sorted according to the GNU en_US locale.
     "암호"		; ko
     "パスワード"	; ja