diff --git a/Makefile.in b/Makefile.in
index 4b1e217c..e649c4f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -249,6 +249,16 @@ FFMPEG_CONFIGURE_ARGS := \
 	--disable-inline-asm \
 	--enable-demuxer=matroska \
 
+FFMPEG_i386-unix_CONFIGURE_ARGS := \
+	--cross-prefix=i686-linux-gnu- \
+	--arch=x86 \
+	--target-os=linux
+
+FFMPEG_x86_64-unix_CONFIGURE_ARGS := \
+	--cross-prefix=x86_64-linux-gnu- \
+	--arch=x86_64 \
+	--target-os=linux
+
 $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
 $(eval $(call rules-configure,ffmpeg,i386,unix))
 $(eval $(call rules-configure,ffmpeg,x86_64,unix))
diff --git a/make/rules-configure.mk b/make/rules-configure.mk
index 2e9e0416..a89875f4 100644
--- a/make/rules-configure.mk
+++ b/make/rules-configure.mk
@@ -13,10 +13,9 @@ $$(OBJ)/.$(1)-$(3)-configure:
 
 	cd "$$($(2)_$(3)_OBJ)" && env $$($(2)_$(3)_ENV) \
 	$$($(2)_SRC)/configure $(--quiet?) \
-	    --cross-prefix=$$($(3)-$(4)_TARGET)- \
 	    --prefix="$$($(2)_$(3)_DST)" \
 	    --libdir="$$($(2)_$(3)_LIBDIR)/$$($(3)-$(4)_LIBDIR)" \
-	    $$($(3)-$(4)_CONFIGURE_ARGS) \
+	    $$($(2)_$(3)-$(4)_CONFIGURE_ARGS) \
 	    $$($(2)_CONFIGURE_ARGS) \
 	    $$($(2)_$(3)_CONFIGURE_ARGS)
 
@@ -32,9 +31,4 @@ $$(OBJ)/.$(1)-$(3)-build:
 endif
 endef
 
-i386-unix_CONFIGURE_ARGS := --arch=x86 --target-os=linux
-x86_64-unix_CONFIGURE_ARGS := --arch=x86_64 --target-os=linux
-i386-windows_CONFIGURE_ARGS := --arch=x86 --target-os=windows
-x86_64-windows_CONFIGURE_ARGS := --arch=x86_64 --target-os=windows
-
 rules-configure = $(call create-rules-configure,$(1),$(call toupper,$(1)),$(2),$(3))