diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4eb5b5e8e18..e4eabc0cc50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* simple.el (normal-erase-is-backspace-mode): Map kp-delete identically
+	to `delete' (bug#16109).
+
 2013-12-11  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
 	* progmodes/octave.el (octave-mode, inferior-octave-mode): Link to
diff --git a/lisp/simple.el b/lisp/simple.el
index 260c1702def..af1139bb942 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7435,7 +7435,7 @@ See also `normal-erase-is-backspace'."
 	     (if enabled
 		 (progn
 		   (define-key local-function-key-map [delete] [deletechar])
-		   (define-key local-function-key-map [kp-delete] [?\C-d])
+		   (define-key local-function-key-map [kp-delete] [deletechar])
 		   (define-key local-function-key-map [backspace] [?\C-?])
                    (dolist (b bindings)
                      ;; Not sure if input-decode-map is really right, but