diff --git a/include/ChangeLog b/include/ChangeLog
index 02cc439dc..b53345359 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-22  Werner Koch  <wk@gnupg.org>
+
+	* util.h: Add strncasecmp.  Removed stricmp and memicmp.
+
 2002-05-10  Stefan Bellon  <sbellon@sbellon.de>
 
 	* mpi.h: New function mpi_debug_alloc_like for M_DEBUG.
diff --git a/include/util.h b/include/util.h
index 908f4b4e0..b49b6c9c6 100644
--- a/include/util.h
+++ b/include/util.h
@@ -205,9 +205,6 @@ int ascii_tolower (int c);
 int ascii_strcasecmp( const char *a, const char *b );
 int ascii_memcasecmp( const char *a, const char *b, size_t n );
 
-#ifndef HAVE_MEMICMP
-int memicmp( const char *a, const char *b, size_t n );
-#endif
 #ifndef HAVE_STPCPY
 char *stpcpy(char *a,const char *b);
 #endif
@@ -220,15 +217,15 @@ char *strsep (char **stringp, const char *delim);
 #ifndef HAVE_STRCASECMP
 int strcasecmp( const char *, const char *b);
 #endif
+#ifndef HAVE_STRNCASECMP
+int strncasecmp (const char *, const char *b, size_t n);
+#endif
 #ifndef HAVE_STRTOUL
   #define strtoul(a,b,c)  ((unsigned long)strtol((a),(b),(c)))
 #endif
 #ifndef HAVE_MEMMOVE
   #define memmove(d, s, n) bcopy((s), (d), (n))
 #endif
-#ifndef HAVE_STRICMP
-  #define stricmp(a,b)	 strcasecmp( (a), (b) )
-#endif
 
 #if defined (__MINGW32__) || defined (__CYGWIN32__)
 /*-- w32reg.c --*/