diff -ru a/external/FFmpeg/Makefile b/external/FFmpeg/Makefile
--- a/external/FFmpeg/Makefile	2010-08-24 04:54:20.000000000 +1200
+++ b/external/FFmpeg/Makefile	2010-10-23 14:37:27.940001767 +1300
@@ -33,7 +33,7 @@
 
 FFLIBS := avutil
 
-DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
+DATA_FILES := $(wildcard $(SRC_PATH_BARE)/external/FFmpeg/ffpresets/*.ffpreset)
 
 SKIPHEADERS = cmdutils_common_opts.h
 
@@ -58,7 +58,7 @@
 	$(STRIP) $@
 
 config.h: .config
-.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
+.config: $(wildcard $(FFLIBS:%=$(SRC_PATH_BARE)/external/FFmpeg/lib%/all*.c))
 	@-tput bold 2>/dev/null
 	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
 	@-tput sgr0 2>/dev/null
diff -ru a/external/FFmpeg/version.sh b/external/FFmpeg/version.sh
--- a/external/FFmpeg/version.sh	2010-08-29 08:16:22.000000000 +1200
+++ b/external/FFmpeg/version.sh	2010-10-23 13:46:24.806668144 +1300
@@ -26,7 +26,7 @@
 test $revision || revision=UNKNOWN
 
 # releases extract the version number from the VERSION file
-version=$(cd "$1" && cat VERSION 2> /dev/null)
+version=$(. "$1/VERSION" 2> /dev/null && echo "$SOURCE_VERSION")
 test $version || version=$revision
 
 test -n "$3" && version=$version-$3