diff --git a/Makefile.in b/Makefile.in
index 455c04a31a..082c63c8e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -780,6 +780,7 @@ clean2:
 	-(cd src; /bin/rm cscope.out)
 	-(cd src/libafs; /bin/rm -rf afs afsint config rx)
 	-(cd src/libuafs; /bin/rm -rf afs afsint config rx)
+	-(cd tests ${COMPILE_CLEAN})
 	-/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} ${TOP_JLIBDIR}
 	-/bin/rm -rf libafs_tree ${SYS_NAME}
 
@@ -948,10 +949,33 @@ distclean: clean
 	tests/volser/Makefile \
 	src/helper-splint.sh
 	if test -d doc/man-pages ; then \
-	    rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
+	    /bin/rm -f doc/man-pages/Makefile doc/man-pages/install-man ; \
+	fi
+	if test -d doc/doxygen ; then \
+	    /bin/rm -f doc/doxygen/Doxyfile ; \
 	fi
 
 pristine: distclean
-	/bin/rm -f src/config/afsconfig.h.in configure configure-libafs aclocal.m4
+	/bin/rm -f src/config/afsconfig.h.in configure configure-libafs \
+	aclocal.m4 \
+	libtool \
+	build-tools/ltmain.sh \
+	src/cf/libtool.m4 \
+	src/cf/ltoptions.m4 \
+	src/cf/ltsugar.m4 \
+	src/cf/ltversion.m4 \
+	src/cf/lt~obsolete.m4
+	if test -d doc/xml ; then \
+	    /bin/rm -f doc/xml/mobi-fixup.xsl ; \
+	fi
+	if test -d doc/man-pages ; then \
+	    /bin/rm -rf doc/man-pages/man1 \
+		doc/man-pages/man3 \
+		doc/man-pages/man5 \
+		doc/man-pages/man8 ; \
+	fi
+	for i in doc/man-pages/pod*/*.pod.in; do \
+	    /bin/rm -f $${i%.in}; \
+	done
 
 maintainer-clean: pristine
diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in
index 0d260d1998..16abc10b7a 100644
--- a/src/crypto/hcrypto/Makefile.in
+++ b/src/crypto/hcrypto/Makefile.in
@@ -66,9 +66,8 @@ dest: libafshcrypto.la libafshcrypto.a
 
 clean:
 	$(LT_CLEAN)
-	$(RM) -f ${OBJECTS} rand-fortuna_lwp.o \
-		libafshcrypto.a libafshcrypto_lwp.a libafshcrypto.exp \
-		test_cipher test_cipher.o
+	$(RM) -f *.o libafshcrypto.a libafshcrypto_lwp.a libafshcrypto.exp \
+		test_cipher
 
 $(LT_objs): $(HEADERS)
 
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index c3c57f15f3..b773205c01 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -269,5 +269,5 @@ clean:
 	$(LT_CLEAN)
 	$(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
 	rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
-	rmtsysd AFS_component_version_number.c \
+	rmtsysd AFS_component_version_number.c syscall.c \
 	afs.exp afsl.exp libafssetpag.* Krmtsys.cs.c Krmtsys.h Krmtsys.xdr.c
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 046d81a8c2..88812b2ac4 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -194,7 +194,7 @@ dest: volserver
 
 clean:
 	$(LT_CLEAN)
-	$(RM) -f *.o volserver core AFS_component_version_number.c \
+	$(RM) -f *.o vos volserver core AFS_component_version_number.c \
 		vl_errors.c vlserver.h
 
 include ../config/Makefile.version
diff --git a/src/venus/test/Makefile.in b/src/venus/test/Makefile.in
index a6e56bd447..667df2afe3 100644
--- a/src/venus/test/Makefile.in
+++ b/src/venus/test/Makefile.in
@@ -7,7 +7,6 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 top_builddir=@top_builddir@
 
@@ -30,16 +29,16 @@ all test:  fulltest owntest idtest getinitparams
 install:
 dest:
 
-fulltest: fulltest.lo
-	$(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs)
-owntest: owntest.lo
-	$(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs)
-idtest: idtest.lo
-	$(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs)
-getinitparams: getinitparams.lo
-	$(LT_LDRULE_static) $@.lo $(LT_deps) $(LT_libs)
+fulltest: fulltest.o
+	$(LT_LDRULE_static) $@.o $(LT_deps) $(LT_libs)
+owntest: owntest.o
+	$(LT_LDRULE_static) $@.o $(LT_deps) $(LT_libs)
+idtest: idtest.o
+	$(LT_LDRULE_static) $@.o $(LT_deps) $(LT_libs)
+getinitparams: getinitparams.o
+	$(LT_LDRULE_static) $@.o $(LT_deps) $(LT_libs)
 
 clean:
 	$(LT_CLEAN)
-	$(RM) -f fulltest owntest idtest getinitparams
+	$(RM) -f *.o fulltest owntest idtest getinitparams
 
diff --git a/tests/opr/Makefile.in b/tests/opr/Makefile.in
index 5e7057cd2e..7625eb43a4 100644
--- a/tests/opr/Makefile.in
+++ b/tests/opr/Makefile.in
@@ -33,4 +33,5 @@ uuid-t: uuid-t.o
 	$(LT_LDRULE_static) uuid-t.o ../tap/libtap.a $(LIBS) $(XLIBS)
 
 clean distclean:
+	$(LT_CLEAN)
 	$(RM) -f $(tests) *.o core
diff --git a/tests/rx/Makefile.in b/tests/rx/Makefile.in
index f629d1bf7f..f5b4cf9244 100644
--- a/tests/rx/Makefile.in
+++ b/tests/rx/Makefile.in
@@ -19,5 +19,5 @@ event-t: event-t.o $(LIBS)
 install:
 
 clean distclean:
-	$(LT_clean)
+	$(LT_CLEAN)
 	$(RM) -f $(tests) *.o core