=== modified file 'lisp/erc/ChangeLog'
--- lisp/erc/ChangeLog	2014-10-02 11:55:22 +0000
+++ lisp/erc/ChangeLog	2014-10-02 19:27:33 +0000
@@ -1,3 +1,7 @@
+2014-10-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).
+
 2014-10-02  Kelvin White  <kwhite@gnu.org>
 
 	* erc.el (erc-rename-buffer-p): When set to t buffers will be

=== modified file 'lisp/erc/erc.el'
--- lisp/erc/erc.el	2014-10-02 11:55:22 +0000
+++ lisp/erc/erc.el	2014-10-02 19:27:04 +0000
@@ -6082,7 +6082,7 @@
                  nick login host
                  (if full-name (format " (%s)" full-name) "")
                  (if (or voice halfop op admin owner)
-                     (format " and is +%s%s on %s"
+                     (format " and is +%s%s%s%s%s on %s"
                              (if voice "v" "")
                              (if halfop "h" "")
                              (if op "o" "")