diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c08de89273..6befeb0670f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* bindings.el (function-key-map): Don't bind shifted keypad
+	numeric keys.
+
 2002-01-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* enriched.el (enriched-handle-display-prop): Remove unused
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 1c7915e17ce..f034e57c8cf 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -830,14 +830,17 @@ language you are using."
 (define-key function-key-map [C-S-kp-home] [C-S-home])
 (define-key function-key-map [C-S-kp-up] [C-S-up])
 (define-key function-key-map [C-S-kp-prior] [C-S-prior])
-(define-key function-key-map [S-kp-1] [S-end])
-(define-key function-key-map [S-kp-2] [S-down])
-(define-key function-key-map [S-kp-3] [S-next])
-(define-key function-key-map [S-kp-4] [S-left])
-(define-key function-key-map [S-kp-6] [S-right])
-(define-key function-key-map [S-kp-7] [S-home])
-(define-key function-key-map [S-kp-8] [S-up])
-(define-key function-key-map [S-kp-9] [S-prior])
+;; Don't bind shifted keypad numeric keys, they reportedly
+;; interfere with the feature of some keyboards to produce
+;; numbers when NumLock is off.
+;(define-key function-key-map [S-kp-1] [S-end])
+;(define-key function-key-map [S-kp-2] [S-down])
+;(define-key function-key-map [S-kp-3] [S-next])
+;(define-key function-key-map [S-kp-4] [S-left])
+;(define-key function-key-map [S-kp-6] [S-right])
+;(define-key function-key-map [S-kp-7] [S-home])
+;(define-key function-key-map [S-kp-8] [S-up])
+;(define-key function-key-map [S-kp-9] [S-prior])
 (define-key function-key-map [C-S-kp-1] [C-S-end])
 (define-key function-key-map [C-S-kp-2] [C-S-down])
 (define-key function-key-map [C-S-kp-3] [C-S-next])