diff --git a/src/ChangeLog b/src/ChangeLog
index 74e6a168043..105a03a2b8c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-21  Ken Raeburn  <raeburn@mit.edu>
+
+	* keymap.c (shadow_lookup): Use make_number to pass a number to
+	Fsubstring.
+
 2005-11-21  Juri Linkov  <juri@jurta.org>
 
 	* puresize.h (BASE_PURESIZE): Increment to 1180000.
diff --git a/src/keymap.c b/src/keymap.c
index f2370225ab8..311a70f25e8 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2379,7 +2379,8 @@ shadow_lookup (shadow, key, flag)
       value = Flookup_key (XCAR (tail), key, flag);
       if (NATNUMP (value))
 	{
-	  value = Flookup_key (XCAR (tail), Fsubstring (key, 0, value), flag);
+	  value = Flookup_key (XCAR (tail),
+			       Fsubstring (key, make_number (0), value), flag);
 	  if (!NILP (value))
 	    return Qnil;
 	}