diff --git a/Makefile b/Makefile
index 682e8ad781..eca3386713 100644
--- a/Makefile
+++ b/Makefile
@@ -161,9 +161,6 @@ endif
 
 PARTS = libmpdemux \
         libmpcodecs \
-        libavutil \
-        libavcodec \
-        libavformat \
         libao2 \
         osdep \
         postproc \
@@ -532,6 +529,10 @@ distclean: clean doxygen_clean
 	-rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG)
 	-rm -f .depend configure.log codecs.conf.h help_mp.h
 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
+	$(MAKE) -C libavutil distclean SRC_PATH=.. 
+	$(MAKE) -C libavcodec distclean SRC_PATH=.. 
+	$(MAKE) -C libavcodec/libpostproc distclean SRC_PATH=../..
+	$(MAKE) -C libavformat distclean SRC_PATH=..
 
 strip:
 	strip -s $(ALL_PRG)
@@ -542,6 +543,9 @@ depend: help_mp.h
 	./version.sh `$(CC) -dumpversion`
 	$(CC) -MM $(CFLAGS) -DCODECS2HTML mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
 	@for a in $(PARTS); do $(MAKE) -C $$a dep; done
+	$(MAKE) -C libavutil dep SRC_PATH=..
+	$(MAKE) -C libavcodec dep SRC_PATH=..
+	$(MAKE) -C libavformat dep SRC_PATH=..
 
 # ./configure must be run if it changed in CVS
 config.h: configure