diff --git a/Makefile.am b/Makefile.am
index 33aa5b689..404ccea76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ BUILT_SOURCES = $(top_srcdir)/.version
 #AM_CFLAGS= @PREFER_NON_PIC@
 AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) $(FNM_FLAGS) $(NCURSES_CFLAGS)
 
-common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@
+common_ldflags= -export-dynamic @STATIC@ @PTHREAD_LDFLAGS@
 
 SUFFICES =
 TESTS =
@@ -166,11 +166,11 @@ CLEANFILES += $(shader_DATA)
 
 $(r_depfiles_remade):
 	$(MKDIR_P) $(@D)
-	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r qfcc@' >$@-t && $(am__mv) $@-t $@
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r $(QFCC)@' >$@-t && $(am__mv) $@-t $@
 
 $(pas_depfiles_remade):
 	$(MKDIR_P) $(@D)
-	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas qfcc@' >$@-t && $(am__mv) $@-t $@
+	echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas $(QFCC)@' >$@-t && $(am__mv) $@-t $@
 
 am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) $(pas_depfiles_remade)
 	echo findme $(ruamoko_gui_libgui_a_dep)
diff --git a/config.d/build_control.m4 b/config.d/build_control.m4
index 48adc0b03..db8efb6e8 100644
--- a/config.d/build_control.m4
+++ b/config.d/build_control.m4
@@ -246,7 +246,7 @@ if test "x$ENABLE_tools_qfbsp" = xyes; then
 	QF_NEED(libs,[models image util])
 fi
 if test "x$ENABLE_tools_qfcc" = xyes; then
-	QFCC_TARGETS="qfcc qfprogs\$(EXEEXT)"
+	QFCC_TARGETS="qfcc\$(EXEEXT) qfprogs\$(EXEEXT)"
 	QF_NEED(tools,[qfcc])
 	QF_NEED(libs,[gamecode util])
 fi
diff --git a/config.d/windows.m4 b/config.d/windows.m4
index e0ee907c8..8718d4355 100644
--- a/config.d/windows.m4
+++ b/config.d/windows.m4
@@ -19,6 +19,9 @@ case "$host_os" in
 		;;
 	cygwin*)
 		cygwin=yes
+		SYSTYPE=WIN32
+		AC_DEFINE(NEED_GNUPRINTF)
+		FNM_FLAGS="-I\$(top_srcdir)/include/win32"
 		if test "x$host" != "x$build"; then
 			CC="$host_cpu-$host_os-gcc"
 			AS="$CC"
diff --git a/configure.ac b/configure.ac
index 17c225b2e..56b006597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ case "${host}" in
 		fi
 
 		;;
-	i?86-*-cygwin*)
+	i?86-*-cygwin*|x86_64-*-cygwin*)
 		SYSTYPE=WIN32
 		AC_MSG_RESULT([Win32 driver])
 		WIN32_LIBS=' $(NET_LIBS)'
diff --git a/ruamoko/gui/Makemodule.am b/ruamoko/gui/Makemodule.am
index ee25d5111..4f18772ac 100644
--- a/ruamoko/gui/Makemodule.am
+++ b/ruamoko/gui/Makemodule.am
@@ -15,7 +15,7 @@ ruamoko_gui_libgui_a_SOURCES= \
 	ruamoko/gui/View.r
 ruamoko_gui_libgui_a_dep=$(call qcautodep,$(ruamoko_gui_libgui_a_SOURCES))
 ruamoko_gui_libgui_a_AR=	$(PAK) -cf
-EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=pak
+EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_gui_libgui_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_gui_libgui_a_dep)
 
diff --git a/ruamoko/lib/Makemodule.am b/ruamoko/lib/Makemodule.am
index 2528d5d40..eb110b6d9 100644
--- a/ruamoko/lib/Makemodule.am
+++ b/ruamoko/lib/Makemodule.am
@@ -33,7 +33,7 @@ ruamoko_lib_libr_a_SOURCES=\
 	ruamoko/lib/Set.r
 ruamoko_lib_libr_a_dep=$(call qcautodep,$(ruamoko_lib_libr_a_SOURCES))
 ruamoko_lib_libr_a_AR=$(PAK) -cf
-EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=pak
+EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_lib_libr_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_lib_libr_a_dep)
 
@@ -83,7 +83,7 @@ ruamoko_lib_libqw_a_SOURCES= \
 	ruamoko/lib/math.r
 ruamoko_lib_libqw_a_dep=$(call qcautodep,$(ruamoko_lib_libqw_a_src))
 ruamoko_lib_libqw_a_AR=$(PAK) -cf
-EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=pak
+EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_lib_libqw_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_lib_libqw_a_dep)
 
@@ -94,7 +94,7 @@ ruamoko_lib_libnq_a_SOURCES=\
 	ruamoko/lib/math.r
 ruamoko_lib_libnq_a_dep=$(call qcautodep,$(ruamoko_lib_libnq_a_src))
 ruamoko_lib_libnq_a_AR=$(PAK) -cf
-EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=pak
+EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_lib_libnq_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_lib_libnq_a_dep)
 
@@ -103,7 +103,7 @@ ruamoko_lib_libcsqc_a_SOURCES=\
 	$(ruamoko_lib_common_src)
 ruamoko_lib_libcsqc_a_dep=$(call qcautodep,$(ruamoko_lib_libcsqc_a_src))
 ruamoko_lib_libcsqc_a_AR=	$(PAK) -cf
-EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=pak
+EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_lib_libcsqc_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_lib_libcsqc_a_dep)
 
diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am
index cd278606b..5c32944ff 100644
--- a/ruamoko/qwaq/Makemodule.am
+++ b/ruamoko/qwaq/Makemodule.am
@@ -24,7 +24,7 @@ ruamoko_qwaq_libui_a_SOURCES= \
 	ruamoko/qwaq/ui/window.r
 ruamoko_qwaq_libui_a_dep=$(call qcautodep,$(ruamoko_qwaq_libui_a_SOURCES))
 ruamoko_qwaq_libui_a_AR=$(PAK) -cf
-EXTRA_ruamoko_qwaq_libui_a_DEPENDENCIES=pak
+EXTRA_ruamoko_qwaq_libui_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_qwaq_libui_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_qwaq_libui_a_dep)
 
diff --git a/ruamoko/scheme/Makemodule.am b/ruamoko/scheme/Makemodule.am
index 8c1d43622..19b23cae4 100644
--- a/ruamoko/scheme/Makemodule.am
+++ b/ruamoko/scheme/Makemodule.am
@@ -33,7 +33,7 @@ ruamoko_scheme_libscheme_a_SOURCES=\
 	ruamoko/scheme/BaseContinuation.r
 ruamoko_scheme_libscheme_a_dep=$(call qcautodep,$(ruamoko_scheme_libscheme_a_SOURCES))
 ruamoko_scheme_libscheme_a_AR=$(PAK) -cf
-EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=pak
+EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=$(PAK)
 include $(ruamoko_scheme_libscheme_a_dep) # am--include-marker
 r_depfiles_remade += $(ruamoko_scheme_libscheme_a_dep)