diff --git a/src/ChangeLog b/src/ChangeLog
index cf792aaf215..dcaae37ad7e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-19  Gerd Moellmann  <gerd@gnu.org>
+
+	* composite.c (Ffind_composition_internal): Accept ZV
+	and a string's end position as POS.
+
 2001-06-18  Gerd Moellmann  <gerd@gnu.org>
 
 	* composite.c (Ffind_composition_internal): Check POS
diff --git a/src/composite.c b/src/composite.c
index 6db705cec4e..c18d8eb749c 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -782,12 +782,12 @@ See `find-composition' for more detail.")
   if (!NILP (string))
     {
       CHECK_STRING (string, 2);
-      if (XINT (pos) < 0 || XINT (pos) >= XSTRING (string)->size)
+      if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
 	args_out_of_range (string, pos);
     }
   else
     {
-      if (XINT (pos) < BEGV || XINT (pos) >= ZV)
+      if (XINT (pos) < BEGV || XINT (pos) > ZV)
 	args_out_of_range (Fcurrent_buffer (), pos);
     }