diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 67a706e21..49e1b368c 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -27,6 +27,9 @@ QWAQ_TARGETS=""
 QW_DESKTOP_DATA=""
 NQ_DESKTOP_DATA=""
 
+PAK_TARGETS
+QFCC_TARGETS
+
 CD_TARGETS=""
 SND_TARGETS=""
 VID_MODEL_TARGETS=""
@@ -211,42 +214,52 @@ if test "x$ENABLE_servers_qw" = xyes; then
 fi
 
 if test "x$ENABLE_tools_bsp2img" = xyes; then
+	BSP2IMG_TARGETS=bsp2img
 	QF_NEED(tools,[bsp2img])
 	QF_NEED(libs,[image util])
 fi
 if test "x$ENABLE_tools_carne" = xyes; then
+	CARNE_TARGETS=carne
 	QF_NEED(tools,[carne])
 	QF_NEED(libs,[gib ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_pak" = xyes; then
+	PAK_TARGETS=pak
 	QF_NEED(tools,[pak])
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfbsp" = xyes; then
+	QFBSP_TARGETS=qfbsp
 	QF_NEED(tools,[qfbsp])
 	QF_NEED(libs,[models image util])
 fi
 if test "x$ENABLE_tools_qfcc" = xyes; then
+	QFCC_TARGETS=qfcc qfprogs
 	QF_NEED(tools,[qfcc])
 	QF_NEED(libs,[gamecode util])
 fi
 if test "x$ENABLE_tools_qflight" = xyes; then
+	QFLIGHT_TARGETS=qflight
 	QF_NEED(tools,[qflight])
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qflmp" = xyes; then
+	QFLMP_TARGETS=qflmp
 	QF_NEED(tools,[qflmp])
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfmodelgen" = xyes; then
+	QFMODELGEN_TARGETS=qfmodelgen
 	QF_NEED(tools,[qfmodelgen])
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfspritegen" = xyes; then
+	QFSPRITEGEN_TARGETS=qfspritegen
 	QF_NEED(tools,[qfspritegen])
 	QF_NEED(libs,[util])
 fi
 if test "x$ENABLE_tools_qfvis" = xyes; then
+	QFVIS_TARGETS=qfvis
 	QF_NEED(tools,[qfvis])
 	QF_NEED(libs,[util])
 fi
@@ -259,10 +272,12 @@ if test "x$ENABLE_tools_qwaq" = xyes; then
 	QF_NEED(libs,[ruamoko gamecode util])
 fi
 if test "x$ENABLE_tools_wad" = xyes; then
+	WAD_TARGETS=wad
 	QF_NEED(tools,[wad])
 	QF_NEED(libs,[image util])
 fi
 if test "x$ENABLE_tools_wav" = xyes; then
+	WAV_TARGETS=wav
 	QF_NEED(tools,[wav])
 	QF_NEED(libs,[util])
 fi
@@ -399,6 +414,19 @@ QF_SUBST(VID_REND_TARGETS)
 QF_SUBST(VID_REND_NOINST_TARGETS)
 QF_SUBST(VID_TARGETS)
 
+QF_SUBST(BSP2IMG_TARGETS)
+QF_SUBST(CARNE_TARGETS)
+QF_SUBST(PAK_TARGETS)
+QF_SUBST(QFBSP_TARGETS)
+QF_SUBST(QFCC_TARGETS)
+QF_SUBST(QFLIGHT_TARGETS)
+QF_SUBST(QFLMP_TARGETS)
+QF_SUBST(QFMODELGEN_TARGETS)
+QF_SUBST(QFSPRITEGEN_TARGETS)
+QF_SUBST(QFVIS_TARGETS)
+QF_SUBST(WAD_TARGETS)
+QF_SUBST(WAV_TARGETS)
+
 QF_DEPS(BSP2IMG,
 	[],
 	[$(top_builddir)/libs/image/libQFimage.la
diff --git a/tools/bsp2img/Makemodule.am b/tools/bsp2img/Makemodule.am
index bf58c14aa..24b6594c2 100644
--- a/tools/bsp2img/Makemodule.am
+++ b/tools/bsp2img/Makemodule.am
@@ -2,7 +2,8 @@ BSP2IMG_LIBS=@BSP2IMG_LIBS@
 BSP2IMG_DEPS=@BSP2IMG_DEPS@
 BSP2IMG_INCS=@BSP2IMG_INCS@
 
-bin_PROGRAMS += bsp2img
+EXTRA_PROGRAMS +=		bsp2img
+bin_PROGRAMS += @BSP2IMG_TARGETS@
 
 bsp2img_SOURCES= tools/bsp2img/bsp2img.c
 bsp2img_LDADD= $(BSP2IMG_LIBS)
diff --git a/tools/carne/Makemodule.am b/tools/carne/Makemodule.am
index 24f5f056b..fe5862c0e 100644
--- a/tools/carne/Makemodule.am
+++ b/tools/carne/Makemodule.am
@@ -1,7 +1,8 @@
 CARNE_LIBS=@CARNE_LIBS@
 CARNE_DEPS=@CARNE_DEPS@
 
-noinst_PROGRAMS += carne
+EXTRA_PROGRAMS +=		carne
+noinst_PROGRAMS += @CARNE_TARGETS@
 
 carne_SOURCES=	tools/carne/main.c
 carne_LDADD=	$(CARNE_LIBS)
diff --git a/tools/cross/mingw64/cross-configure.sh b/tools/cross/mingw64/cross-configure.sh
index 73f76c677..b9aa14371 100755
--- a/tools/cross/mingw64/cross-configure.sh
+++ b/tools/cross/mingw64/cross-configure.sh
@@ -1,19 +1,19 @@
 #!/bin/sh -x
 set -e
-mkdir -p native x86_64-w64-mingw32
+mkdir -p native i686-w64-mingw32.static
 cd native
 ../../configure \
 	--disable-shared \
 	--without-clients \
 	--without-servers \
 	--with-tools=qfcc,pak
-cd ../x86_64-w64-mingw32
+cd ../i686-w64-mingw32.static
 export MINGW=/opt/mxe
-export MINGW_USR=$MINGW/usr/x86_64-w64-mingw32
+export MINGW_USR=$MINGW/usr/i686-w64-mingw32.static
 export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig
 export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
 export PATH=$MINGW/usr/bin:$PATH
 ../../configure \
-	--host=x86_64-w64-mingw32 \
+	--host=i686-w64-mingw32.static \
 	--disable-shared \
 	$*
diff --git a/tools/pak/Makemodule.am b/tools/pak/Makemodule.am
index d7a247e88..3716b0b17 100644
--- a/tools/pak/Makemodule.am
+++ b/tools/pak/Makemodule.am
@@ -2,7 +2,8 @@ PAK_LIBS=@PAK_LIBS@
 PAK_DEPS=@PAK_DEPS@
 PAK_INCS=@PAK_INCS@
 
-bin_PROGRAMS +=		pak
+EXTRA_PROGRAMS +=		pak
+bin_PROGRAMS +=		@PAK_TARGETS@
 bin_SCRIPTS +=		tools/pak/zpak
 
 man_MANS +=			tools/pak/pak.1 tools/pak/zpak.1
diff --git a/tools/qfbsp/source/Makemodule.am b/tools/qfbsp/source/Makemodule.am
index 2e3e9a524..1dda50b5c 100644
--- a/tools/qfbsp/source/Makemodule.am
+++ b/tools/qfbsp/source/Makemodule.am
@@ -2,7 +2,8 @@ QFBSP_LIBS=@QFBSP_LIBS@
 QFBSP_DEPS=@QFBSP_DEPS@
 QFBSP_INCS=@QFBSP_INCS@
 
-bin_PROGRAMS += qfbsp
+EXTRA_PROGRAMS +=		qfbsp
+bin_PROGRAMS += @QFBSP_TARGETS@
 
 qfbsp_SOURCES= \
 	tools/qfbsp/source/brush.c \
diff --git a/tools/qfcc/source/Makemodule.am b/tools/qfcc/source/Makemodule.am
index dacfd3448..97b4eeb5c 100644
--- a/tools/qfcc/source/Makemodule.am
+++ b/tools/qfcc/source/Makemodule.am
@@ -2,7 +2,8 @@ QFCC_LIBS=@QFCC_LIBS@
 QFCC_DEPS=@QFCC_DEPS@
 QFCC_INCS=@QFCC_INCS@
 
-bin_PROGRAMS +=	qfcc qfprogs
+EXTRA_PROGRAMS +=	qfcc qfprogs
+bin_PROGRAMS +=	@QFCC_TARGETS@
 bin_SCRIPTS += tools/qfcc/source/qfpreqcc
 
 qfcc_SOURCES = \
diff --git a/tools/qflight/source/Makemodule.am b/tools/qflight/source/Makemodule.am
index 0913e37a8..8990cea7a 100644
--- a/tools/qflight/source/Makemodule.am
+++ b/tools/qflight/source/Makemodule.am
@@ -2,7 +2,8 @@ QFLIGHT_LIBS=@QFLIGHT_LIBS@
 QFLIGHT_DEPS=@QFLIGHT_DEPS@
 QFLIGHT_INCS=@QFLIGHT_INCS@
 
-bin_PROGRAMS += qflight
+EXTRA_PROGRAMS +=		qflight
+bin_PROGRAMS += @QFLIGHT_TARGETS@
 
 qflight_SOURCES=\
 	tools/qflight/source/entities.c \
diff --git a/tools/qflmp/Makemodule.am b/tools/qflmp/Makemodule.am
index 78dd3a233..f1a07221a 100644
--- a/tools/qflmp/Makemodule.am
+++ b/tools/qflmp/Makemodule.am
@@ -2,7 +2,8 @@ QFLMP_LIBS=@QFLMP_LIBS@
 QFLMP_DEPS=@QFLMP_DEPS@
 QFLMP_INCS=@QFLMP_INCS@
 
-bin_PROGRAMS +=	qflmp
+EXTRA_PROGRAMS +=		qflmp
+bin_PROGRAMS +=	@QFLMP_TARGETS@
 
 #mans=qflmp.1
 man_MANS +=	$(mans)
diff --git a/tools/qfmodelgen/source/Makemodule.am b/tools/qfmodelgen/source/Makemodule.am
index 9ca6ae7ef..86d40702e 100644
--- a/tools/qfmodelgen/source/Makemodule.am
+++ b/tools/qfmodelgen/source/Makemodule.am
@@ -2,7 +2,8 @@ QFMODELGEN_LIBS=@QFMODELGEN_LIBS@
 QFMODELGEN_DEPS=@QFMODELGEN_DEPS@
 QFMODELGEN_INCS=@QFMODELGEN_INCS@
 
-bin_PROGRAMS += qfmodelgen
+EXTRA_PROGRAMS +=		qfmodelgen
+bin_PROGRAMS += @QFMODELGEN_TARGETS@
 
 qfmodelgen_SOURCES = \
 	tools/qfmodelgen/source/lbmlib.c \
diff --git a/tools/qfspritegen/Makemodule.am b/tools/qfspritegen/Makemodule.am
index a12777453..ae36299e5 100644
--- a/tools/qfspritegen/Makemodule.am
+++ b/tools/qfspritegen/Makemodule.am
@@ -2,7 +2,8 @@ QFSPRITEGEN_LIBS=@QFSPRITEGEN_LIBS@
 QFSPRITEGEN_DEPS=@QFSPRITEGEN_DEPS@
 QFSPRITEGEN_INCS=@QFSPRITEGEN_INCS@
 
-bin_PROGRAMS += qfspritegen
+EXTRA_PROGRAMS +=		qfspritegen
+bin_PROGRAMS += @QFSPRITEGEN_TARGETS@
 
 qfspritegen_SOURCES= tools/qfspritegen/spritegen.c
 
diff --git a/tools/qfvis/source/Makemodule.am b/tools/qfvis/source/Makemodule.am
index 73ccf547e..cb11f2406 100644
--- a/tools/qfvis/source/Makemodule.am
+++ b/tools/qfvis/source/Makemodule.am
@@ -2,7 +2,8 @@ QFVIS_LIBS=@QFVIS_LIBS@
 QFVIS_DEPS=@QFVIS_DEPS@
 QFVIS_INCS=@QFVIS_INCS@
 
-bin_PROGRAMS += qfvis
+EXTRA_PROGRAMS +=		qfvis
+bin_PROGRAMS += @QFVIS_TARGETS@
 
 qfvis_SOURCES = \
 	tools/qfvis/source/base-vis.c \
diff --git a/tools/wad/Makemodule.am b/tools/wad/Makemodule.am
index dd68d6842..13fcf3a43 100644
--- a/tools/wad/Makemodule.am
+++ b/tools/wad/Makemodule.am
@@ -2,7 +2,8 @@ WAD_LIBS=@WAD_LIBS@
 WAD_DEPS=@WAD_DEPS@
 WAD_INCS=@WAD_INCS@
 
-bin_PROGRAMS +=	wad
+EXTRA_PROGRAMS +=		wad
+bin_PROGRAMS +=	@WAD_TARGETS@
 
 man_MANS += tools/wad/wad.1
 
diff --git a/tools/wav/Makemodule.am b/tools/wav/Makemodule.am
index 4a4726809..6eb727ad0 100644
--- a/tools/wav/Makemodule.am
+++ b/tools/wav/Makemodule.am
@@ -2,7 +2,8 @@ WAV_LIBS=@WAV_LIBS@
 WAV_DEPS=@WAV_DEPS@
 WAV_INCS=@WAV_INCS@
 
-bin_PROGRAMS += qfwavinfo
+EXTRA_PROGRAMS +=		qfwavinfo
+bin_PROGRAMS += @WAV_TARGETS@
 
 #man_MANS +=	tools/wav/qfwavinfo.1