diff --git a/THANKS b/THANKS
index a3f83e20..904d72e3 100644
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,7 @@ Mark Kettenis <kettenis@gnu.org>
 Martin Buchholz
 Matt Mueller <donut@azstarnet.com>
 Michael Haubenwallner <michael.haubenwallner@salomon.at>
+Mike Frysinger <vapier@gentoo.org>
 Nelson Beebe
 Nigel Stepp <stepp@atistart.net>
 Nix <nix@esperi.org.uk>
diff --git a/find/Makefile.am b/find/Makefile.am
index c9207e9f..34317873 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -9,7 +9,7 @@ libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c exec.c tree.c util.
 # one without (called "oldfind").  The oldfind binary is no longer
 # installed.
 bin_PROGRAMS     = find
-noinst_PROGRAMS = oldfind
+check_PROGRAMS   = oldfind
 find_SOURCES     = ftsfind.c
 oldfind_SOURCES  = oldfind.c
 man_MANS         = find.1
diff --git a/m4/withfts.m4 b/m4/withfts.m4
index 8fb91e32..71a93af8 100644
--- a/m4/withfts.m4
+++ b/m4/withfts.m4
@@ -6,9 +6,7 @@ AC_DEFUN([FIND_WITH_FTS],
   case $with_fts in
         yes) ;;
         '')     with_fts=yes ;;
-	 no)	AC_MSG_ERROR([Using --without-fts is not longer supported]) ;;
+	no)	AC_MSG_ERROR([Using --without-fts is not longer supported]) ;;
         *) AC_MSG_ERROR([Invalid value for --with-fts: $with_fts])
   esac
-  AM_CONDITIONAL(WITH_FTS, [[test x"${with_fts-no}" != xno]])
-  AC_DEFINE([WITH_FTS], 1, [Define if you want to use fts() to do the filesystem search.])
 ])