--- ./lib/Makefile.in.00	2004-03-11 09:57:59.000000000 +0100
+++ ./lib/Makefile.in	2011-01-19 15:18:47.000000000 +0100
@@ -48,10 +48,10 @@
 	getgroups.c gethostname.c getline.c getloadavg.c getndelim2.c \
 	getpass.c gettimeofday.c getusershell.c group-member.c \
 	lchown.c lstat.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \
-	memrchr.c memset.c mkdir.c mkstemp.c mktime.c mountlist.c \
+	memrchr.c memset.c mkdir.c mkstemp.c mountlist.c \
 	nanosleep.c obstack.c obstack.h printf-args.c printf-parse.c \
 	putenv.c raise.c readlink.c readutmp.c realloc.c regex.c \
-	rename.c rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c \
+	rename.c rmdir.c rpmatch.c sig2str.c stpcpy.c \
 	strcasecmp.c strcspn.c strdup.c strncasecmp.c strndup.c \
 	strnlen.c strpbrk.c strstr.c strtod.c strtoimax.c strtol.c \
 	strtoll.c strtoul.c strtoull.c strtoumax.c strverscmp.c \
@@ -105,7 +105,7 @@
 	$(top_srcdir)/m4/memcpy.m4 $(top_srcdir)/m4/memmove.m4 \
 	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/memset.m4 \
 	$(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \
+	$(top_srcdir)/m4/modechange.m4 \
 	$(top_srcdir)/m4/mountlist.m4 $(top_srcdir)/m4/nanosleep.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
 	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/path-concat.m4 \
@@ -126,7 +126,7 @@
 	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
 	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
 	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
-	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdbool.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
 	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
@@ -216,7 +216,7 @@
 @AMDEP_TRUE@	$(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \
 @AMDEP_TRUE@	$(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \
 @AMDEP_TRUE@	$(DEPDIR)/mkdir.Po $(DEPDIR)/mkstemp.Po \
-@AMDEP_TRUE@	$(DEPDIR)/mktime.Po $(DEPDIR)/mountlist.Po \
+@AMDEP_TRUE@	$(DEPDIR)/mountlist.Po \
 @AMDEP_TRUE@	$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \
 @AMDEP_TRUE@	$(DEPDIR)/printf-args.Po $(DEPDIR)/printf-parse.Po \
 @AMDEP_TRUE@	$(DEPDIR)/putenv.Po $(DEPDIR)/raise.Po \
@@ -224,7 +224,7 @@
 @AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \
 @AMDEP_TRUE@	$(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \
 @AMDEP_TRUE@	$(DEPDIR)/rpmatch.Po $(DEPDIR)/sig2str.Po \
-@AMDEP_TRUE@	$(DEPDIR)/stat.Po $(DEPDIR)/stpcpy.Po \
+@AMDEP_TRUE@	$(DEPDIR)/stpcpy.Po \
 @AMDEP_TRUE@	$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \
 @AMDEP_TRUE@	$(DEPDIR)/strdup.Po $(DEPDIR)/strncasecmp.Po \
 @AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
@@ -618,7 +618,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mktime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mountlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nanosleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack.Po@am__quote@
@@ -634,7 +633,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rmdir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rpmatch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sig2str.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcspn.Po@am__quote@
--- ./Makefile.in.00	2010-01-13 13:14:34.000000000 +0100
+++ ./Makefile.in	2011-01-19 15:17:07.000000000 +0100
@@ -91,7 +91,7 @@
 	$(top_srcdir)/m4/memcpy.m4 $(top_srcdir)/m4/memmove.m4 \
 	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/memset.m4 \
 	$(top_srcdir)/m4/mkdir-slash.m4 $(top_srcdir)/m4/mkstemp.m4 \
-	$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \
+	$(top_srcdir)/m4/modechange.m4 \
 	$(top_srcdir)/m4/mountlist.m4 $(top_srcdir)/m4/nanosleep.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/obstack.m4 \
 	$(top_srcdir)/m4/onceonly.m4 $(top_srcdir)/m4/path-concat.m4 \
@@ -112,7 +112,7 @@
 	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
 	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
 	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
-	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdbool.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
 	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
--- ./src/Makefile.in.00	2011-03-01 14:36:12.000000000 +0100
+++ ./src/Makefile.in	2011-03-01 14:45:43.000000000 +0100
@@ -16,7 +16,7 @@
 
 
 
-SOURCES = $(__SOURCES) cat.c chmod.c $(chown_SOURCES) $(cp_SOURCES) $(ginstall_SOURCES) link.c ln.c mkdir.c mknod.c $(mv_SOURCES) readlink.c $(rm_SOURCES) rmdir.c stat.c touch.c unlink.c
+SOURCES = $(__SOURCES) cat.c chmod.c $(chown_SOURCES) $(cp_SOURCES) $(ginstall_SOURCES) link.c ln.c mkdir.c mknod.c $(mv_SOURCES) readlink.c $(rm_SOURCES) rmdir.c unlink.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -44,8 +44,8 @@
 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) \
 	mkdir$(EXEEXT) \
 	mknod$(EXEEXT) mv$(EXEEXT) readlink$(EXEEXT) \
-	rm$(EXEEXT) rmdir$(EXEEXT) stat$(EXEEXT) \
-	touch$(EXEEXT) unlink$(EXEEXT) cat$(EXEEXT) \
+	rm$(EXEEXT) rmdir$(EXEEXT) \
+	unlink$(EXEEXT) cat$(EXEEXT) \
 	$(am__EXEEXT_2)
 noinst_PROGRAMS = setuidgid$(EXEEXT)
 subdir = src
@@ -121,7 +121,7 @@
 	$(top_srcdir)/m4/sha.m4 $(top_srcdir)/m4/sig2str.m4 \
 	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/ssize_t.m4 \
 	$(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/st_mtim.m4 \
-	$(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdbool.m4 \
+	$(top_srcdir)/m4/stdbool.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \
 	$(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
 	$(top_srcdir)/m4/strcspn.m4 $(top_srcdir)/m4/strdup.m4 \
@@ -473,11 +473,6 @@
 split_LDADD = $(LDADD)
 split_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
 	../lib/libfetish.a
-stat_SOURCES = stat.c
-stat_OBJECTS = stat.$(OBJEXT)
-stat_LDADD = $(LDADD)
-stat_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
-	../lib/libfetish.a
 stty_SOURCES = stty.c
 stty_OBJECTS = stty.$(OBJEXT)
 stty_LDADD = $(LDADD)
@@ -514,11 +509,6 @@
 test_LDADD = $(LDADD)
 test_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
 	../lib/libfetish.a
-touch_SOURCES = touch.c
-touch_OBJECTS = touch.$(OBJEXT)
-touch_LDADD = $(LDADD)
-touch_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
-	../lib/libfetish.a
 tr_SOURCES = tr.c
 tr_OBJECTS = tr.$(OBJEXT)
 tr_LDADD = $(LDADD)
@@ -631,11 +621,11 @@
 @AMDEP_TRUE@	./$(DEPDIR)/setuidgid.Po ./$(DEPDIR)/sha1sum.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/shred.Po ./$(DEPDIR)/sleep.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/sort.Po ./$(DEPDIR)/split.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stat.Po ./$(DEPDIR)/stty.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/stty.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/su.Po ./$(DEPDIR)/sum.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/sync.Po ./$(DEPDIR)/tac.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/tail.Po ./$(DEPDIR)/tee.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/test.Po ./$(DEPDIR)/touch.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/test.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/tr.Po ./$(DEPDIR)/true.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/tsort.Po ./$(DEPDIR)/tty.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/uname.Po ./$(DEPDIR)/unexpand.Po \
@@ -657,8 +647,8 @@
 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
 	rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
-	sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
-	tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
+	sort.c split.c stty.c su.c sum.c sync.c tac.c tail.c \
+	tee.c test.c tr.c true.c tsort.c tty.c uname.c \
 	unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
 	wc.c who.c whoami.c yes.c
 DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
@@ -671,8 +661,8 @@
 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
 	rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
-	sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
-	tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
+	sort.c split.c stty.c su.c sum.c sync.c tac.c tail.c \
+	tee.c test.c tr.c true.c tsort.c tty.c uname.c \
 	unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
 	wc.c who.c whoami.c yes.c
 HEADERS = $(noinst_HEADERS)
@@ -1173,9 +1163,6 @@
 split$(EXEEXT): $(split_OBJECTS) $(split_DEPENDENCIES) 
 	@rm -f split$(EXEEXT)
 	$(LINK) $(split_LDFLAGS) $(split_OBJECTS) $(split_LDADD) $(LIBS)
-stat$(EXEEXT): $(stat_OBJECTS) $(stat_DEPENDENCIES) 
-	@rm -f stat$(EXEEXT)
-	$(LINK) $(stat_LDFLAGS) $(stat_OBJECTS) $(stat_LDADD) $(LIBS)
 stty$(EXEEXT): $(stty_OBJECTS) $(stty_DEPENDENCIES) 
 	@rm -f stty$(EXEEXT)
 	$(LINK) $(stty_LDFLAGS) $(stty_OBJECTS) $(stty_LDADD) $(LIBS)
@@ -1200,9 +1187,6 @@
 test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
 	$(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS)
-touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES) 
-	@rm -f touch$(EXEEXT)
-	$(LINK) $(touch_LDFLAGS) $(touch_OBJECTS) $(touch_LDADD) $(LIBS)
 tr$(EXEEXT): $(tr_OBJECTS) $(tr_DEPENDENCIES) 
 	@rm -f tr$(EXEEXT)
 	$(LINK) $(tr_LDFLAGS) $(tr_OBJECTS) $(tr_LDADD) $(LIBS)
@@ -1360,7 +1344,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/split.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stty.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sum.Po@am__quote@
@@ -1369,7 +1352,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tee.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/true.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsort.Po@am__quote@
@@ -1649,9 +1631,9 @@
 	  $(srcdir)/true.c > $@-t
 	@chmod a-w $@-t
 	mv $@-t $@
-fs.h: stat.c extract-magic
+fs.h: extract-magic
 	rm -f $@
-	$(PERL) $(srcdir)/extract-magic $(srcdir)/stat.c > $@t
+	$(PERL) $(srcdir)/extract-magic > $@t
 	@chmod a-w $@t
 	mv $@t $@
 # Ensure that the list of programs in README matches the list
--- ./src/Makefile.am.00	2010-01-13 12:37:28.000000000 +0100
+++ ./src/Makefile.am	2011-03-01 14:43:53.000000000 +0100
@@ -5,7 +5,7 @@
 bin_SCRIPTS = 
 bin_PROGRAMS = chown chmod cp \
   ginstall link ln mkdir \
-  mknod mv readlink rm rmdir stat touch unlink \
+  mknod mv readlink rm rmdir unlink \
   cat \
   $(OPTIONAL_BIN_PROGS) $(DF_PROG)
 
@@ -194,9 +194,9 @@
 	mv $@-t $@
 
 BUILT_SOURCES += fs.h
-fs.h: stat.c extract-magic
+fs.h: extract-magic
 	rm -f $@
-	$(PERL) $(srcdir)/extract-magic $(srcdir)/stat.c > $@t
+	$(PERL) $(srcdir)/extract-magic > $@t
 	@chmod a-w $@t
 	mv $@t $@