diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e69c6be3dcb..822a4a26870 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-27  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+	* font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of
+	&optional (bug#13819).
+
 2013-02-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-adb.el (tramp-adb-parse-device-names)
@@ -5,8 +10,8 @@
 
 2013-02-26  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
-	"2>/dev/null" to the ls command, in case "en_US.utf8" is not
+	* net/tramp-sh.el (tramp-sh-handle-insert-directory):
+	Add "2>/dev/null" to the ls command, in case "en_US.utf8" is not
 	defined.  POSIX environments fall back to the "C" locale then and
 	emit a warning, which shall be suppressed.
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index e5ce4db171b..9436012ee59 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2336,9 +2336,9 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
        ("`\\(\\(?:\\sw\\|\\s_\\)\\(?:\\sw\\|\\s_\\)+\\)'"
         (1 font-lock-constant-face prepend))
        ;; Constant values.
-       ("\\<:\\(?:\\sw\\|\\s_\\)+\\>" 0 font-lock-builtin-face)
+       ("\\_<:\\(?:\\sw\\|\\s_\\)+\\_>" 0 font-lock-builtin-face)
        ;; ELisp and CLisp `&' keywords as types.
-       ("\\<\\&\\(?:\\sw\\|\\s_\\)+\\>" . font-lock-type-face)
+       ("\\_<\\&\\(?:\\sw\\|\\s_\\)+\\_>" . font-lock-type-face)
        ;; ELisp regexp grouping constructs
        ((lambda (bound)
           (catch 'found