diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2d1302a5febe667255ab4172d4e4543f12830d1d..81a6d1365b8a1e7c8dc9095c670af8a6689d65c9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -444,7 +444,8 @@ depend: $(SRCS)
 dep:	depend
 
 clean: $(CLEANAMR)
-	rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) i386/*.o i386/*~ \
+	rm -f *.o *.d *~ i386/*.o i386/*~ \
+	   *.a *.lib *.so *.dylib *.dll \
 	   armv4l/*.o armv4l/*~ \
 	   mlib/*.o mlib/*~ \
 	   alpha/*.o alpha/*~ \
diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index 7c7f8b487fc46b073ace64b027e5803f9369cc7f..a549f3184212eed84955cc8d188c91a735f34523 100644
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -25,10 +25,10 @@ CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
 all:    $(SWSLIB) $(LIB) $(SLIBNAME)
 
 clean:
-	rm -f *.o *.a *~ *$(SLIBSUF) $(LIB) $(SLIBNAME)
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend
+distclean: clean
+	rm -f Makefile.bak .depend
 
 dep:    depend
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4c837442043ed22ef8977a355e98ab724cd32d9c..b88c90f74aff617ab006b509215e69622a913f71 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -143,7 +143,7 @@ install-headers:
 	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 
 distclean clean:
-	rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB)
+	rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
 
 #
 # include dependency files if they exist
diff --git a/libavutil/Makefile b/libavutil/Makefile
index a4b902c62a837700eb9a162beddddfdbbea9d101..99a4c114f7d3d0d82fddd73744ec73d2e3f8d9e6 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -50,7 +50,7 @@ depend: $(SRCS)
 dep:	depend
 
 clean:
-	rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF)
+	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
 
 distclean: clean
 	rm -f Makefile.bak .depend
diff --git a/vhook/Makefile b/vhook/Makefile
index f473a6e8d36614cf4ccfed444d66ae5e2a9c4da7..1ee2c5ef55baed76e385f078935df82004f0b3af 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -40,7 +40,7 @@ drawtext$(SLIBSUF): drawtext.o
 	$(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
 
 clean:
-	rm -f *.o *.d .depend *$(SLIBSUF) *~
+	rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
 
 ifneq ($(wildcard .depend),)
 include .depend