diff --git a/Make.rules.in b/Make.rules.in
index 19b4b8b8acd..a90115a0f47 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -139,6 +139,11 @@ $(MAKEDEP) check_makedep:
 $(BUILD) checkbuild:
 	cd $(TOPOBJDIR)/tools; $(SUBMAKE) build@PROGEXT@
 
+# Rule to rebuild winestub.o
+
+$(WINESTUB) check_winestub:
+	cd $(TOPOBJDIR)/library; $(SUBMAKE) winestub.o
+
 # Rule for main module
 
 $(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index fbcf93b28e2..86679a13f07 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -26,12 +26,12 @@ depend::
 @MAKE_RULES@
 
 # Override resource compiler rules
-icinfo: icinfo.o
+icinfo: icinfo.o $(WINESTUB)
 	$(CC) -o icinfo icinfo.o $(LDOPTIONS) $(ALL_LIBS)
 
-aviinfo: aviinfo.o
+aviinfo: aviinfo.o $(WINESTUB)
 	$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
-aviplay: aviplay.o
+aviplay: aviplay.o $(WINESTUB)
 	$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 7f4c5aae3ff..f61757592fe 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -43,7 +43,7 @@ depend::
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 
-clock: $(MOSTOBJS) $(STRINGOBJS)
+clock: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
 	$(CC) -o clock $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
 
 install: dummy
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index cebbb3b3d82..f4445d3b010 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -29,7 +29,7 @@ depend:: $(RC_SRCS:.rc=.h)
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 
-cmdlgtst: $(OBJS)
+cmdlgtst: $(OBJS) $(WINESTUB)
 	$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index 6b1fca7e5a1..f9b6fe18a31 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -13,7 +13,7 @@ all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-control: $(OBJS)
+control: $(OBJS) $(WINESTUB)
 	$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index d41dbdddfdf..74aeda3273b 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -44,7 +44,7 @@ depend::
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 
-notepad: $(MOSTOBJS) $(STRINGOBJS)
+notepad: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
 	$(CC) -o notepad $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
 
 install: dummy
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index ada82d4654a..bd297c99e7c 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -48,7 +48,7 @@ depend:: $(RC_SRCS:.rc=.h)
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 
-progman: $(MOSTOBJS) $(STRINGOBJS)
+progman: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
 	$(CC) -o progman $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
 
 install: dummy
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index f207727daed..410d2b6aca4 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -18,7 +18,7 @@ depend::
 
 @MAKE_RULES@
 
-regapi: $(OBJS)
+regapi: $(OBJS) $(WINESTUB)
 	$(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index aee54afd102..250e954db22 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -15,7 +15,7 @@ all: $(PROGRAMS)
 
 @MAKE_RULES@
 
-regtest: $(OBJS)
+regtest: $(OBJS) $(WINESTUB)
 	$(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index cebba1c3672..c9d3fb87f0a 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -31,7 +31,7 @@ depend:: $(RC_SRCS:.rc=.h)
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 
-view: $(OBJS)
+view: $(OBJS) $(WINESTUB)
 	$(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 947929982f8..c4360a1c260 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -27,7 +27,7 @@ depend:: $(RC_SRCS:.rc=.h)
 #this line is needed to prevent winestub.o being linked
 WINESTUB = 
 
-wcmd: $(OBJS)
+wcmd: $(OBJS) $(WINESTUB)
 	$(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index 94003fa129e..24f62e1e410 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -43,7 +43,7 @@ depend:: $(RC_SRCS:.rc=.h) y.tab.h
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
 
 # Some strings need addresses >= 0x10000
-winhelp: $(MOSTOBJS) $(STRINGOBJS)
+winhelp: $(MOSTOBJS) $(STRINGOBJS) $(WINESTUB)
 	$(CC) -o winhelp $(MOSTOBJS) $(LDOPTIONS) $(ALL_LIBS) $(STRINGOBJS)
 
 hlp2sgml: hlp2sgml.o hlpfile.o
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 57bac031085..013de746cbe 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -15,7 +15,7 @@ all: check_wrc $(PROGRAMS)
 
 @MAKE_RULES@
 
-winver: $(OBJS)
+winver: $(OBJS) $(WINESTUB)
 	$(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install: dummy