diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 766a4b7fad..3a405c34ed 100644
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -1,3 +1,11 @@
+config FFMPEG_X86ASM
+	bool "Compile x86 ASM"
+	depends on (x86_64 || (i386 && !(TARGET_x86_geode || TARGET_x86_legacy)))
+	help
+		This compiles ffmpeg with x86 assembly optimizations. This option is needed as NASM is
+		totally broken with CPU_TYPE=pentium.
+	default y
+
 if PACKAGE_libffmpeg-custom
 
 comment "Build Licensing"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 296515a1fa..16bbb343bb 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=3.4.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@@ -482,13 +482,11 @@ ifeq ($(ARCH),x86_64)
 	FFMPEG_CONFIGURE+= --enable-lto
 endif
 
-ifneq ($(CONFIG_TARGET_x86),)
-ifeq ($(CONFIG_NASM),y)
+ifeq ($(CONFIG_FFMPEG_X86ASM),y)
   FFMPEG_CONFIGURE += --enable-x86asm
 else
   FFMPEG_CONFIGURE += --disable-x86asm
 endif
-endif
 
 ifeq ($(BUILD_VARIANT),full)