diff --git a/Makefile b/Makefile
index 8d9c2230b6b03192d66152aea825ea03bdeeb5c8..ae3dcd87a7c50a41e2dbd1b6d75c3e56063ae8b9 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@ endif
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
-CLEANVHOOK=clean-vhook
 endif
 
 ifeq ($(TARGET_OS), SunOS)
@@ -151,21 +150,23 @@ endif
 	@test -f .libs || touch .libs
 	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
-clean: $(CLEANVHOOK)
+clean:
 	$(MAKE) -C libavutil clean
 	$(MAKE) -C libavcodec clean
 	$(MAKE) -C libavformat clean
 	$(MAKE) -C tests clean
-	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
-	   ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
-
-clean-vhook:
 	$(MAKE) -C vhook clean
+	rm -f *.o *.d *~ .libs gmon.out TAGS \
+	   $(PROG) $(PROGTEST) $(QTFASTSTART)
 
 # Note well: config.log is NOT removed.
 distclean: clean
-	$(MAKE) -C libavcodec distclean
-	rm -f config.mak config.h *.pc
+	$(MAKE) -C libavutil   distclean
+	$(MAKE) -C libavcodec  distclean
+	$(MAKE) -C libavformat distclean
+	$(MAKE) -C tests       distclean
+	$(MAKE) -C vhook       distclean
+	rm -f Makefile.bak .depend config.mak config.h *.pc
 
 TAGS:
 	etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 81a6d1365b8a1e7c8dc9095c670af8a6689d65c9..46258e8d080f5d9d01e1b0a1aa9dba65ea0cf3b5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -444,8 +444,8 @@ depend: $(SRCS)
 dep:	depend
 
 clean: $(CLEANAMR)
-	rm -f *.o *.d *~ i386/*.o i386/*~ \
-	   *.a *.lib *.so *.dylib *.dll \
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
+	   i386/*.o i386/*~ \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
@@ -459,6 +459,7 @@ clean: $(CLEANAMR)
 
 distclean: clean
 	rm -f Makefile.bak .depend
+	$(MAKE) -C libpostproc distclean
 
 cleanamr:
 	$(MAKE) -C amr clean
diff --git a/libavformat/Makefile b/libavformat/Makefile
index b88c90f74aff617ab006b509215e69622a913f71..947a93acc39fcfd7331d328f9557f1ced6ec3150 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -142,8 +142,11 @@ install-headers:
 %.o: %.cpp
 	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 
-distclean clean:
-	rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
+clean:
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
+
+distclean: clean
+	rm -f Makefile.bak .depend
 
 #
 # include dependency files if they exist
diff --git a/tests/Makefile b/tests/Makefile
index 4bcad531a72c449adb1e548838e75500dae8869c..08b0d59d836368247e1056b5a0057e8a19fc30f7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,6 @@ dsptestpic: dsptest.c $(DSPDEPS)
 dsptest: dsptest.c $(DSPDEPS)
 	$(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
 
-clean:
+distclean clean:
 	rm -rf vsynth1 vsynth2 data
 	rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr
diff --git a/vhook/Makefile b/vhook/Makefile
index 1ee2c5ef55baed76e385f078935df82004f0b3af..58844f950ad6249815e3e452351b6befd69e73da 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -40,7 +40,10 @@ drawtext$(SLIBSUF): drawtext.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
 
 clean:
-	rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
+
+distclean: clean
+	rm -f Makefile.bak .depend
 
 ifneq ($(wildcard .depend),)
 include .depend