diff --git a/ChangeLog b/ChangeLog
index d400932..69dba0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-19  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
 
+        * src/key-list.cc (Key_List::output_lookup_function_body): Avoid
+          outputting a trivially satisfied test for len.
+
         * src/key-list.cc (output_keyword_entry): Avoid outputting a struct
           initializer of the form {"key",}.
 
diff --git a/src/key-list.cc b/src/key-list.cc
index 21b27a1..b7931c1 100644
--- a/src/key-list.cc
+++ b/src/key-list.cc
@@ -1523,8 +1523,14 @@ Key_List::output_lookup_function_body (const Output_Compare& comparison)
 {
   T (Trace t ("Key_List::output_lookup_function_body");)
 
-  printf ("  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)\n"
-          "    {\n"
+  /* Since `len' is of type `unsigned int', we can avoid comparing it
+     against zero. */
+  if (min_key_len == 0)
+    printf ("  if (len <= MAX_WORD_LENGTH)\n");
+  else
+    printf ("  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)\n");
+
+  printf ("    {\n"
           "      register int key = %s (str, len);\n\n",
           option.get_hash_name ());