diff --git a/aclocal.m4 b/aclocal.m4
index 00eeb98bbc0..41eb7f6717a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -299,6 +299,10 @@ wine_fn_config_makefile ()
     ac_enable=$[2]
     ac_flags=$[3]
 
+    case $ac_dir in
+    dnl These are created as symlinks for wow64 builds
+    fonts|server) test -z "$with_wine64" || return ;;
+    esac
     AS_VAR_IF([$ac_enable],[no],[wine_fn_disabled_rules; return])
     wine_fn_all_rules
     wine_fn_install_rules
diff --git a/configure b/configure
index 14b40825a0e..bee8e6b2261 100755
--- a/configure
+++ b/configure
@@ -7511,6 +7511,9 @@ wine_fn_config_makefile ()
     ac_enable=$2
     ac_flags=$3
 
+    case $ac_dir in
+        fonts|server) test -z "$with_wine64" || return ;;
+    esac
     if eval test \"x\$"$ac_enable"\" = x"no"; then :
   wine_fn_disabled_rules; return
 fi
@@ -18263,15 +18266,15 @@ fi
 
 if test -n "$with_wine64"
 then
-    wine_fn_append_rule "all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server tools:
+    wine_fn_append_rule "all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+fonts server:
 	\$(RM) \$@ && \$(LN_S) $with_wine64/\$@ \$@
 $with_wine64/loader/wine:
 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@
 $with_wine64/loader/wine-preloader:
 	\$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@
 clean::
-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
+	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader"
 else
     WINELOADER_INSTALL="wine.inf"
 
diff --git a/configure.ac b/configure.ac
index b57ff6a1595..09e0f536e70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3596,15 +3596,15 @@ fi
 if test -n "$with_wine64"
 then
     WINE_APPEND_RULE(
-[all: fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader
-fonts server tools:
+[all: fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader
+fonts server:
 	\$(RM) \$[@] && \$(LN_S) $with_wine64/\$[@] \$[@]
 $with_wine64/loader/wine:
 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@]
 $with_wine64/loader/wine-preloader:
 	\$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@]
 clean::
-	\$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
+	\$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader])
 else
     AC_SUBST(WINELOADER_INSTALL,"wine.inf")
     WINE_APPEND_RULE(