diff --git a/ChangeLog b/ChangeLog
index 1692af4..f4f8a4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-11-26  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* [w3m-dev 02556]
+	* indep.c (strcasestr): strcasestr("", "") should not return NULL
+
 	* [w3m-dev 02555]
 	* configure: check strcasestr
 	* fm.h (_GNU_SOURCE): requires for strcasestr()
diff --git a/indep.c b/indep.c
index d935b54..2842677 100644
--- a/indep.c
+++ b/indep.c
@@ -1,4 +1,4 @@
-/* $Id: indep.c,v 1.10 2001/11/26 09:01:08 ukai Exp $ */
+/* $Id: indep.c,v 1.11 2001/11/26 09:04:01 ukai Exp $ */
 #include "fm.h"
 #include <stdio.h>
 #include <pwd.h>
@@ -177,6 +177,8 @@ strcasestr(const char *s1, const char *s2)
     int len1, len2;
     if (s2 == NULL)
 	return (char *)s1;
+    if (*s2 == '\0')
+	return (char *)s1;
     len1 = strlen(s1);
     len2 = strlen(s2);
     while (*s1 && len1 >= len2) {