diff --git a/configure b/configure
index 05a5bc8d0..c80b3dfaf 100755
--- a/configure
+++ b/configure
@@ -5746,21 +5746,6 @@ $as_echo "#define NEED_STRTOKEN /**/" >>confdefs.h
 fi
 done
 
-for ac_func in strtok
-do :
-  ac_fn_c_check_func "$LINENO" "strtok" "ac_cv_func_strtok"
-if test "x$ac_cv_func_strtok" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRTOK 1
-_ACEOF
-
-else
-
-$as_echo "#define NEED_STRTOK /**/" >>confdefs.h
-
-fi
-done
-
 for ac_func in strerror
 do :
   ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
diff --git a/configure.ac b/configure.ac
index b76c9614f..8ccd682a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,6 @@ AC_CHECK_FUNCS([setproctitle],
 )
 
 AC_CHECK_FUNCS(strtoken,,AC_DEFINE([NEED_STRTOKEN], [], [Define if you need the strtoken function.]))
-AC_CHECK_FUNCS(strtok,,AC_DEFINE([NEED_STRTOK], [], [Define if you need the strtok function.]))
 AC_CHECK_FUNCS(strerror,,AC_DEFINE([NEED_STRERROR], [], [Define if you need the strerror function.]))
 AC_CHECK_FUNCS(strtoul,,STRTOUL="strtoul.o")
 AC_CHECK_FUNCS(explicit_bzero,AC_DEFINE([HAVE_EXPLICIT_BZERO], [], [Define if you have explicit_bzero]))
diff --git a/include/common.h b/include/common.h
index afa8f5749..00797b8fc 100644
--- a/include/common.h
+++ b/include/common.h
@@ -95,9 +95,6 @@ extern int smycmp(const char *, const char *);
 extern int myncmp(const char *, const char *, int);
 #endif
 
-#ifdef NEED_STRTOK
-extern char *strtok2(char *, char *);
-#endif
 #ifdef NEED_STRTOKEN
 extern char *strtoken(char **, char *, char *);
 #endif
diff --git a/include/setup.h.in b/include/setup.h.in
index c3b733976..99fd350ca 100644
--- a/include/setup.h.in
+++ b/include/setup.h.in
@@ -106,9 +106,6 @@
 /* Define to 1 if you have the `strlncat' function. */
 #undef HAVE_STRLNCAT
 
-/* Define to 1 if you have the `strtok' function. */
-#undef HAVE_STRTOK
-
 /* Define to 1 if you have the `strtoken' function. */
 #undef HAVE_STRTOKEN
 
@@ -145,9 +142,6 @@
 /* Define if you need the strerror function. */
 #undef NEED_STRERROR
 
-/* Define if you need the strtok function. */
-#undef NEED_STRTOK
-
 /* Define if you need the strtoken function. */
 #undef NEED_STRTOKEN
 
diff --git a/include/windows/setup.h b/include/windows/setup.h
index 6b33d239c..4714a45fc 100644
--- a/include/windows/setup.h
+++ b/include/windows/setup.h
@@ -25,7 +25,6 @@
 #undef  SYSSYSLOGH
 #define NOINDEX
 #define NEED_STRTOKEN
-#undef  NEED_STRTOK
 #undef  TIMES_2
 #undef  GETRUSAGE_2
 #define CONFDIR "conf"
diff --git a/src/support.c b/src/support.c
index f709e9b6c..2367efd2c 100644
--- a/src/support.c
+++ b/src/support.c
@@ -73,20 +73,6 @@ char *strtoken(char **save, char *str, char *fs)
 }
 #endif /* NEED_STRTOKEN */
 
-#ifdef	NEED_STRTOK
-/*
-** NOT encouraged to use!
-*/
-
-char *strtok2(char *str, char *fs)
-{
-	static char *pos;
-
-	return strtoken(&pos, str, fs);
-}
-
-#endif /* NEED_STRTOK */
-
 #ifdef NEED_STRERROR
 /*
 **	strerror - return an appropriate system error string to a given errno