diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 1521bc40..a6d0f1bd 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -20,7 +20,12 @@ include $(dir $(lastword $(MAKEFILE_LIST))).config.mk
 
 define DOWNLOAD
 	@mkdir -p $(LIBAVDIR)/build
-	wget -O $(2) $(1)
+	if test -z "$${TVHEADEND_FILE_CACHE}"; then \
+          wget -O $(2) $(1); \
+        else \
+          file=$$(basename $(2)); \
+          cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
+        fi
 endef
 
 define UNTAR
@@ -50,7 +55,7 @@ LIBVORBIS       = libvorbis-1.3.4
 LIBVORBIS_TB    = $(LIBVORBIS).tar.gz
 LIBVORBIS_URL   = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS_TB)
 
-LIBX264         = last_x264
+LIBX264         = x264-snapshot-20141012-2245
 LIBX264_TB      = $(LIBX264).tar.bz2
 LIBX264_URL     = ftp://ftp.videolan.org/pub/x264/snapshots/$(LIBX264_TB)
 
@@ -102,9 +107,9 @@ $(LIBAVDIR)/$(LIBVORBIS)/.tvh_build: \
 
 $(LIBAVDIR)/$(LIBX264)/.tvh_download:
 	$(call DOWNLOAD,$(LIBX264_URL),$(LIBAVDIR)/$(LIBX264_TB))
-	rm -rf $(LIBAVDIR)/x264-snapshot-*
+	#rm -rf $(LIBAVDIR)/x264-snapshot-*
 	$(call UNTAR,$(LIBX264_TB),j)
-	{ ln -sf $$(basename $(LIBAVDIR)/x264-snapshot-*) $(LIBAVDIR)/$(LIBX264); }
+	#{ ln -sf $$(basename $(LIBAVDIR)/x264-snapshot-*) $(LIBAVDIR)/$(LIBX264); }
 	@touch $@
 
 $(LIBAVDIR)/$(LIBX264)/.tvh_build: \