diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 8fd0c17c..7d6bc7fd 100644
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -47,7 +47,6 @@ export PATH := $(LIBAVDIR)/build/ffmpeg/bin:$(PATH)
 
 ECFLAGS         = -I$(LIBAVDIR)/build/ffmpeg/include
 ELIBS           = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
-SLIBS           = -lx264 -lvpx -lvorbisenc -lvorbis -logg
 
 FFMPEG          = ffmpeg-2.4.2
 FFMPEG_TB       = $(FFMPEG).tar.bz2
@@ -240,17 +239,6 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
 		$(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
 		$(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
 		$(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
-	#
-	# Modify EXTRALIBS to link statically at first shot
-	#
-	@{ \
-	  libs=$$(cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -E "^EXTRALIBS=" | cut -d '=' -f 2-) ; \
-	  cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -Ev "^EXTRALIBS=" > \
-		$(LIBAVDIR)/$(FFMPEG)/config.mak.new ; \
-	  echo "EXTRALIBS=-L$(LIBAVDIR)/build/ffmpeg/lib -Wl,-Bstatic $(SLIBS) -Wl,-Bdynamic $${libs}" > \
-		$(LIBAVDIR)/$(FFMPEG)/config.mak ; \
-	  cat $(LIBAVDIR)/$(FFMPEG)/config.mak.new >> $(LIBAVDIR)/$(FFMPEG)/config.mak ; \
-	}
 	DESTDIR=$(LIBAVDIR)/build \
 		make -C $(LIBAVDIR)/$(FFMPEG) install
 	@touch $@