diff --git a/ChangeLog b/ChangeLog
index d3f9aa89e2..6a893b14e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 1999-02-16  Ulrich Drepper  <drepper@cygnus.com>
 
-	* db2/Makefile: Update.
+	* sysdeps/i386/i486/bits/string.h (memcmp): Correctly set flags
+	for the case N == 0.
+
+	* db2/Makefile (distribute): Add LICENSE.
 
 1999-02-03  Jeff Bailey  <jbailey@nisa.net>
 
diff --git a/db2/Makefile b/db2/Makefile
index 3b46a278d8..f5247b0b13 100644
--- a/db2/Makefile
+++ b/db2/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -34,7 +34,7 @@ headers = db.h db_185.h
 
 distribute = db_int.h config.h compat.h clib/getlong.c btree/btree.src \
 	     db/db.src db185/db185_int.h hash/hash.src log/log.src \
-	     txn/txn.src README \
+	     txn/txn.src README LICENSE \
 	     $(addprefix include/,btree.h btree_auto.h btree_ext.h \
 				  clib_ext.h common_ext.h cxx_int.h \
 				  db.h.src db_185.h.src db_am.h db_auto.h \
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
index e20f037ab7..84421b40a2 100644
--- a/sysdeps/i386/i486/bits/string.h
+++ b/sysdeps/i386/i486/bits/string.h
@@ -172,6 +172,7 @@ memcmp (__const void *__s1, __const void *__s2, size_t __n)
   register int __res;
   __asm__ __volatile__
     ("cld\n\t"
+     "testl %3,%3\n\t"
      "repe; cmpsb\n\t"
      "je	1f\n\t"
      "sbbl	%0,%0\n\t"