diff --git a/Makefile b/Makefile
index 12e18a1775..78da9fc3ff 100644
--- a/Makefile
+++ b/Makefile
@@ -311,7 +311,7 @@ dep depend: help_mp.h version.h codecs.conf.h
 clean:
 	-rm -f *.o *.a *~
 	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
-	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \
+	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo(EXESUF) \
 	  codecs.conf.h help_mp.h version.h
 	@for a in $(PARTS); do $(MAKE) -C $$a clean; done
 
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index c7c61fb104..dc5070ba2e 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -71,5 +71,5 @@ netstream: netstream.o $(NETSTREAM_DEPS)
 clean distclean:
 	rm -f *.o *~ $(OBJS)
 	rm -f fastmem-* fastmem2-* fastmemcpybench netstream
-	rm -f cpuinfo$(EXESUF) bmovl-test$(EXESUF) vfw2menc$(EXESUF)
+	rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF)
 	rm -f $(REAL_TARGETS)
diff --git a/configure b/configure
index bdb95784ee..92e2026684 100755
--- a/configure
+++ b/configure
@@ -1485,9 +1485,9 @@ elif aix; then
   _cpuinfo="lsattr -E -l proc0 -a type"
 elif x86; then
   # all other OSes try to extract CPU information from a small helper
-  # program TOOLS/cpuinfo instead
-  $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
-  _cpuinfo="TOOLS/cpuinfo"
+  # program cpuinfo instead
+  $_cc -o cpuinfo cpuinfo.c
+  _cpuinfo="./cpuinfo"
 fi
 
 if x86 ; then
diff --git a/TOOLS/cpuinfo.c b/cpuinfo.c
similarity index 100%
rename from TOOLS/cpuinfo.c
rename to cpuinfo.c