diff --git a/ChangeLog b/ChangeLog
index f342c686..a2220db2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -178,6 +178,9 @@ CVS code -
 	- Try to automatically detect whether UTF-8 support is needed by
 	  setting the NO_UTF8 flag if setlocale() returns a string that
 	  doesn't contain "UTF-8". (DLR)
+- nano.h:
+	- Remove now-unneeded #defines for functions that now have
+	  multibyte equivalents. (DLR)
 - utils.c:
   regexec_safe()
 	- Remove redundant regexec #define, and move the regexec #undef
diff --git a/src/nano.h b/src/nano.h
index 8ed5dce9..31a50866 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -102,12 +102,8 @@
 
 /* If no strcasestr(), getdelim(), or getline(), use the versions we
  * have. */
-#ifndef HAVE_STRNCASECMP
-#define strncasecmp nstrnicmp
-#endif
-
 #ifndef HAVE_STRCASESTR
-#define strcasestr nstristr
+#define strcasestr nstrcasestr
 #endif
 
 #ifndef HAVE_GETDELIM