diff --git a/src/configure.in b/src/configure.in
index b870ebfc765a6754dfcf6a25952a1168ebf3a243..cee201869f195e4c37596d58ec8aa2120cc663ec 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -4577,7 +4577,6 @@ AC_CHECK_FUNCS( \
  sigaction \
  sigvec \
  strcasecmp \
- strnlen \
  strchr \
  strerror \
  times \
diff --git a/src/port.c b/src/port.c
index 9baeb5a50537281a5fac7ee8f9e6d64d1d42a78d..3f0d3666abd77eb7bcfcd3c88a8bee91fd52318c 100644
--- a/src/port.c
+++ b/src/port.c
@@ -262,15 +262,6 @@ PMOD_EXPORT int STRCASECMP(const char *a,const char *b)
 }
 #endif
 
-#ifndef HAVE_STRNLEN
-size_t STRNLEN(const char *s, size_t maxlen)
-{
-  char *tmp=MEMCHR(s,0,maxlen);
-  if(tmp) return tmp-s;
-  return maxlen;
-}
-#endif
-
 #ifndef HAVE_MEMSET
 void *MEMSET(void *s,int c,size_t n)
 {
diff --git a/src/port.h b/src/port.h
index c472f7684bcba4b9df7dc3c5356065234ecbf762..8142f0486805df421b90f97005e16e180e616420 100644
--- a/src/port.h
+++ b/src/port.h
@@ -164,11 +164,8 @@ PMOD_EXPORT int STRCASECMP(const char *a,const char *b);
 #  define STRCASECMP strcasecmp
 #endif
 
-#ifndef HAVE_STRNLEN
-PMOD_EXPORT size_t STRNLEN(const char *a,size_t len);
-#else
-#  define STRNLEN strnlen
-#endif
+#define HAVE_STRNLEN 1
+#define STRNLEN strnlen
 
 #define HAVE_STRNCMP 1
 #define STRNCMP strncmp