diff --git a/libtest/.cvsignore b/libtest/.cvsignore
index eff5fce5cac..efb2d9a1294 100644
--- a/libtest/.cvsignore
+++ b/libtest/.cvsignore
@@ -1,13 +1,22 @@
 Makefile
 expand
+expand.spec.c
 hello
+hello.spec.c
 hello2
+hello2.spec.c
 hello3
-hello3res.h
+hello3.spec.c
 hello3res.s
 hello4
+hello4.spec.c
 hello5
+hello5.spec.c
 new
+new.spec.c
 rolex
+rolex.spec.c
 vartest
+vartest.spec.c
 volinfo
+volinfo.spec.c
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 1ef3527719c..8dc50b6341b 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -3,66 +3,57 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
-RCFLAGS   = -w32 -h
 PROGRAMS  = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA  = -t -A -p $*
+WRCEXTRA  = -s -p $*
 
-C_SRCS = \
-	expand.c \
-	hello.c \
-	hello2.c \
-	hello3.c \
-	hello4.c \
-	hello5.c \
-	new.c \
-	rolex.c \
-	vartest.c \
-	volinfo.c
+SPEC_SRCS = \
+	expand.spec \
+	hello.spec \
+	hello2.spec \
+	hello3.spec \
+	hello4.spec \
+	hello5.spec \
+	new.spec \
+	rolex.spec \
+	vartest.spec \
+	volinfo.spec
 
 RC_SRCS = \
 	hello3res.rc
 
-all: check_wrc $(PROGRAMS)
-
-depend:: $(RC_SRCS:.rc=.h)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-$(RC_SRCS:.rc=.s): $(WRC)
+expand: expand.o expand.spec.o
+	$(CC) -o expand $+ $(LDOPTIONS) $(ALL_LIBS)
 
-$(WINESTUB):
-	@cd ../library && $(MAKE)
+hello: hello.o hello.spec.o
+	$(CC) -o hello $+ $(LDOPTIONS) $(ALL_LIBS)
 
-expand: expand.o $(WINESTUB)
-	$(CC) -o expand expand.o $(LDOPTIONS) $(ALL_LIBS)
+hello2: hello2.o hello2.spec.o
+	$(CC) -o hello2 $+ $(LDOPTIONS) $(ALL_LIBS)
 
-hello: hello.o $(WINESTUB)
-	$(CC) -o hello hello.o $(LDOPTIONS) $(ALL_LIBS)
+hello3: hello3.o hello3.spec.o hello3res.o
+	$(CC) -o hello3 $+ $(LDOPTIONS) $(ALL_LIBS)
 
-hello2: hello2.o $(WINESTUB)
-	$(CC) -o hello2 hello2.o $(LDOPTIONS) $(ALL_LIBS)
+hello4: hello4.o hello4.spec.o
+	$(CC) -o hello4 $+ $(LDOPTIONS) $(ALL_LIBS)
 
-hello3: hello3res.o hello3.o $(WINESTUB)
-	$(CC) -o hello3 hello3.o hello3res.o $(LDOPTIONS) $(ALL_LIBS)
-hello3.o: hello3res.h
+hello5: hello5.o hello5.spec.o
+	$(CC) -o hello5 $+ $(LDOPTIONS) $(ALL_LIBS)
 
-hello4: hello4.o $(WINESTUB)
-	$(CC) -o hello4 hello4.o $(LDOPTIONS) $(ALL_LIBS)
+new: new.o new.spec.o
+	$(CC) -o new $+ $(LDOPTIONS) $(ALL_LIBS)
 
-hello5: hello5.o $(WINESTUB)
-	$(CC) -o hello5 hello5.o $(LDOPTIONS) $(ALL_LIBS)
+rolex: rolex.o rolex.spec.o
+	$(CC) -o rolex $+ $(LDOPTIONS) $(ALL_LIBS)
 
-new: new.o $(WINESTUB)
-	$(CC) -o new new.o $(LDOPTIONS) $(ALL_LIBS)
+vartest: vartest.o vartest.spec.o
+	$(CC) -o vartest $+ $(LDOPTIONS) $(ALL_LIBS)
 
-rolex: rolex.o $(WINESTUB)
-	$(CC) -o rolex rolex.o $(LDOPTIONS) $(ALL_LIBS)
-
-vartest: vartest.o $(WINESTUB)
-	$(CC) -o vartest vartest.o $(LDOPTIONS) $(ALL_LIBS)
-
-volinfo: volinfo.o $(WINESTUB)
-	$(CC) -o volinfo volinfo.o $(LDOPTIONS) $(ALL_LIBS)
+volinfo: volinfo.o volinfo.spec.o
+	$(CC) -o volinfo $+ $(LDOPTIONS) $(ALL_LIBS)
 
 ### Dependencies:
diff --git a/libtest/expand.spec b/libtest/expand.spec
new file mode 100644
index 00000000000..21c495f0fbb
--- /dev/null
+++ b/libtest/expand.spec
@@ -0,0 +1,4 @@
+name	expand
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/hello.spec b/libtest/hello.spec
new file mode 100644
index 00000000000..623a3d081ac
--- /dev/null
+++ b/libtest/hello.spec
@@ -0,0 +1,4 @@
+name	hello
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/hello2.spec b/libtest/hello2.spec
new file mode 100644
index 00000000000..2b5db6e63f7
--- /dev/null
+++ b/libtest/hello2.spec
@@ -0,0 +1,4 @@
+name	hello2
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/hello3.spec b/libtest/hello3.spec
new file mode 100644
index 00000000000..8dd4e4a3846
--- /dev/null
+++ b/libtest/hello3.spec
@@ -0,0 +1,5 @@
+name	hello3
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	hello3res
diff --git a/libtest/hello4.spec b/libtest/hello4.spec
new file mode 100644
index 00000000000..09699c30e6f
--- /dev/null
+++ b/libtest/hello4.spec
@@ -0,0 +1,4 @@
+name	hello4
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/hello5.spec b/libtest/hello5.spec
new file mode 100644
index 00000000000..b619b3cd100
--- /dev/null
+++ b/libtest/hello5.spec
@@ -0,0 +1,4 @@
+name	hello5
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/new.spec b/libtest/new.spec
new file mode 100644
index 00000000000..089b2b6e1af
--- /dev/null
+++ b/libtest/new.spec
@@ -0,0 +1,4 @@
+name	new
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/rolex.spec b/libtest/rolex.spec
new file mode 100644
index 00000000000..df8d81b2bbd
--- /dev/null
+++ b/libtest/rolex.spec
@@ -0,0 +1,4 @@
+name	rolex
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/vartest.spec b/libtest/vartest.spec
new file mode 100644
index 00000000000..1d80e247134
--- /dev/null
+++ b/libtest/vartest.spec
@@ -0,0 +1,4 @@
+name	vartest
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/libtest/volinfo.spec b/libtest/volinfo.spec
new file mode 100644
index 00000000000..a5a94bffa61
--- /dev/null
+++ b/libtest/volinfo.spec
@@ -0,0 +1,4 @@
+name	volinfo
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/avitools/.cvsignore b/programs/avitools/.cvsignore
index efff115f230..3c3070f88a5 100644
--- a/programs/avitools/.cvsignore
+++ b/programs/avitools/.cvsignore
@@ -1,4 +1,7 @@
 Makefile
 icinfo
+icinfo.spec.c
 aviplay
+aviplay.spec.c
 aviinfo
+aviinfo.spec.c
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 7dae5edddb6..94199d79248 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -6,31 +6,25 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
+WRCEXTRA  = -s -p $*
 
-LANGUAGES   =
-LICENSELANG =
+SPEC_SRCS = \
+	icinfo.spec \
+	aviinfo.spec \
+	aviplay.spec
 
-MOSTSRCS = 		\
-	icinfo.c	\
-	aviinfo.c	\
-	aviinfo.c
-
-MOSTOBJS = $(MOSTSRCS:.c=.o)
-
-all: check_wrc $(PROGRAMS)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-# Override resource compiler rules
-icinfo: icinfo.o $(WINESTUB)
-	$(CC) -o icinfo icinfo.o $(LDOPTIONS) $(ALL_LIBS)
+icinfo: icinfo.o icinfo.spec.o
+	$(CC) -o icinfo icinfo.o icinfo.spec.o $(LDOPTIONS) $(ALL_LIBS)
 
-aviinfo: aviinfo.o $(WINESTUB)
-	$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
-aviplay: aviplay.o $(WINESTUB)
-	$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
+aviinfo: aviinfo.o aviinfo.spec.o
+	$(CC) -o aviinfo aviinfo.o aviinfo.spec.o $(LDOPTIONS) $(ALL_LIBS)
+
+aviplay: aviplay.o aviplay.spec.o
+	$(CC) -o aviplay aviplay.o aviplay.spec.o $(LDOPTIONS) $(ALL_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) icinfo $(bindir)/icinfo
diff --git a/programs/avitools/aviinfo.spec b/programs/avitools/aviinfo.spec
new file mode 100644
index 00000000000..8e74f5106f6
--- /dev/null
+++ b/programs/avitools/aviinfo.spec
@@ -0,0 +1,4 @@
+name	aviinfo
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/avitools/aviplay.spec b/programs/avitools/aviplay.spec
new file mode 100644
index 00000000000..3f4446b50ed
--- /dev/null
+++ b/programs/avitools/aviplay.spec
@@ -0,0 +1,4 @@
+name	aviplay
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/avitools/icinfo.spec b/programs/avitools/icinfo.spec
new file mode 100644
index 00000000000..c925dbd077e
--- /dev/null
+++ b/programs/avitools/icinfo.spec
@@ -0,0 +1,4 @@
+name	icinfo
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/clock/.cvsignore b/programs/clock/.cvsignore
index 20cab03278c..a315e8e2c4a 100644
--- a/programs/clock/.cvsignore
+++ b/programs/clock/.cvsignore
@@ -1,12 +1,4 @@
-Da.s
-De.s
-En.s
-Es.s
-Fi.s
-Fr.s
 Makefile
-Pt.s
-Sw.s
-Wa.s
 clock
+clock.spec.c
 rsrc.s
diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 3cefec0559f..36498df4b0f 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = clock
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA  = -t -A -p clock
+WRCEXTRA  = -s -p clock
 
 LICENSELANG = En
 
@@ -17,9 +17,11 @@ C_SRCS = \
 	main.c \
 	$(LICENSELANG:%=License_%.c)
 
+SPEC_SRCS = clock.spec
+
 RC_SRCS = rsrc.rc
 
-all: check_wrc $(PROGRAMS)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
@@ -28,7 +30,7 @@ all: check_wrc $(PROGRAMS)
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
 
 
-clock: $(OBJS) $(WINESTUB)
+clock: $(OBJS)
 	$(CC) -o clock $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/clock/clock.spec b/programs/clock/clock.spec
new file mode 100644
index 00000000000..2e9df98de58
--- /dev/null
+++ b/programs/clock/clock.spec
@@ -0,0 +1,5 @@
+name	clock
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	clock
diff --git a/programs/cmdlgtst/.cvsignore b/programs/cmdlgtst/.cvsignore
index 5d5c631a9c8..90d8e1b08a0 100644
--- a/programs/cmdlgtst/.cvsignore
+++ b/programs/cmdlgtst/.cvsignore
@@ -1,4 +1,4 @@
 Makefile
-cmdlgr.h
 cmdlgr.s
 cmdlgtst
+cmdlgtst.spec.c
diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in
index 918cccdb59a..52fbec18342 100644
--- a/programs/cmdlgtst/Makefile.in
+++ b/programs/cmdlgtst/Makefile.in
@@ -6,30 +6,22 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = cmdlgtst
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
+WRCEXTRA  = -s -p cmdlgtst
 
 C_SRCS = \
 	cmdlgtst.c
 
+SPEC_SRCS = \
+	cmdlgtst.spec
+
 RC_SRCS = \
 	cmdlgr.rc
 
-all: check_wrc $(PROGRAMS)
-
-depend:: $(RC_SRCS:.rc=.h)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-# Override resource compiler rules
-.rc.s:
-	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
-
-.rc.h:
-	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
-
-
-cmdlgtst: $(OBJS) $(WINESTUB)
+cmdlgtst: $(OBJS)
 	$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
@@ -38,6 +30,4 @@ install::
 uninstall::
 	$(RM) $(bindir)/cmdlgtst
 
-$(RC_SRCS:.rc=.s): $(WRC)
-
 ### Dependencies:
diff --git a/programs/cmdlgtst/cmdlgtst.spec b/programs/cmdlgtst/cmdlgtst.spec
new file mode 100644
index 00000000000..b9301fdfcbf
--- /dev/null
+++ b/programs/cmdlgtst/cmdlgtst.spec
@@ -0,0 +1,5 @@
+name	cmdlgtst
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	cmdlgtst
diff --git a/programs/control/.cvsignore b/programs/control/.cvsignore
index b1e405148da..dafb6940558 100644
--- a/programs/control/.cvsignore
+++ b/programs/control/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 control
+control.spec.c
diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in
index c0fdf1f820f..603c269cdf4 100644
--- a/programs/control/Makefile.in
+++ b/programs/control/Makefile.in
@@ -9,11 +9,13 @@ ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
 
 C_SRCS = control.c
 
-all: $(PROGRAMS)
+SPEC_SRCS = control.spec
+
+all: check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-control: $(OBJS) $(WINESTUB)
+control: $(OBJS)
 	$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/control/control.spec b/programs/control/control.spec
new file mode 100644
index 00000000000..969061ad974
--- /dev/null
+++ b/programs/control/control.spec
@@ -0,0 +1,4 @@
+name	control
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/notepad/.cvsignore b/programs/notepad/.cvsignore
index 4a473777faa..576cdea5ed8 100644
--- a/programs/notepad/.cvsignore
+++ b/programs/notepad/.cvsignore
@@ -1,11 +1,4 @@
-Da.s
-De.s
-En.s
-Es.s
-Fi.s
-Fr.s
 Makefile
-Pt.s
-Sw.s
 notepad
+notepad.spec.c
 rsrc.s
diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index d7a104bcb7f..78de8dbb71e 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = notepad
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA  = -t -A -p notepad
+WRCEXTRA  = -s -p notepad
 
 LICENSELANG = En
 
@@ -18,9 +18,11 @@ C_SRCS = \
 	search.c \
 	$(LICENSELANG:%=License_%.c)
 
+SPEC_SRCS = notepad.spec
+
 RC_SRCS = rsrc.rc
 
-all: check_wrc $(PROGRAMS)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
@@ -28,7 +30,7 @@ all: check_wrc $(PROGRAMS)
 .rc.s:
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
 
-notepad: $(OBJS) $(WINESTUB)
+notepad: $(OBJS)
 	$(CC) -o notepad $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/notepad/notepad.spec b/programs/notepad/notepad.spec
new file mode 100644
index 00000000000..e238e2d44e5
--- /dev/null
+++ b/programs/notepad/notepad.spec
@@ -0,0 +1,5 @@
+name	notepad
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	notepad
diff --git a/programs/osversioncheck/.cvsignore b/programs/osversioncheck/.cvsignore
index 63957244162..769454b5865 100644
--- a/programs/osversioncheck/.cvsignore
+++ b/programs/osversioncheck/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 osversioncheck
+osversioncheck.spec.c
diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in
index a3227e377b6..29f28ccc5e0 100644
--- a/programs/osversioncheck/Makefile.in
+++ b/programs/osversioncheck/Makefile.in
@@ -9,6 +9,8 @@ ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
 
 C_SRCS = osversioncheck.c
 
+SPEC_SRCS = osversioncheck.spec
+
 all: $(PROGRAMS)
 
 @MAKE_RULES@
diff --git a/programs/osversioncheck/osversioncheck.spec b/programs/osversioncheck/osversioncheck.spec
new file mode 100644
index 00000000000..da3eac9628a
--- /dev/null
+++ b/programs/osversioncheck/osversioncheck.spec
@@ -0,0 +1,4 @@
+name	osversioncheck
+mode    cuiexe
+type	win32
+init	main
diff --git a/programs/progman/.cvsignore b/programs/progman/.cvsignore
index a5dd727e157..447481c6f6b 100644
--- a/programs/progman/.cvsignore
+++ b/programs/progman/.cvsignore
@@ -1,31 +1,4 @@
-Da.h
-Da.s
-De.h
-De.s
-En.h
-En.s
-Es.h
-Es.s
-Fi.h
-Fi.s
-Fr.h
-Fr.s
-Hu.h
-Hu.s
-It.h
-It.s
-Ko.h
-Ko.s
 Makefile
-Pt.h
-Pt.s
-Sw.h
-Sw.s
-Va.h
-Va.s
-Wa.h
-Wa.s
-accel.h
-accel.s
 progman
+progman.spec.c
 rsrc.s
diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in
index cd761c60314..ce6378d795c 100644
--- a/programs/progman/Makefile.in
+++ b/programs/progman/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = progman
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA  = -t -A -p progman
+WRCEXTRA  = -s -p progman
 
 LICENSELANG = En
 
@@ -20,9 +20,11 @@ C_SRCS = \
 	string.c \
 	$(LICENSELANG:%=License_%.c)
 
+SPEC_SRCS = progman.spec
+
 RC_SRCS = rsrc.rc
 
-all: check_wrc $(PROGRAMS)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
@@ -30,7 +32,7 @@ all: check_wrc $(PROGRAMS)
 .rc.s:
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
 
-progman: $(OBJS) $(WINESTUB)
+progman: $(OBJS)
 	$(CC) -o progman $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/progman/progman.spec b/programs/progman/progman.spec
new file mode 100644
index 00000000000..560ee13a09d
--- /dev/null
+++ b/programs/progman/progman.spec
@@ -0,0 +1,5 @@
+name	progman
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	progman
diff --git a/programs/regapi/.cvsignore b/programs/regapi/.cvsignore
index be405f53ac6..bb58883f33f 100644
--- a/programs/regapi/.cvsignore
+++ b/programs/regapi/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 regapi
+regapi.spec.c
diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in
index 0e34628d33f..55d24610d6e 100644
--- a/programs/regapi/Makefile.in
+++ b/programs/regapi/Makefile.in
@@ -6,17 +6,18 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regapi
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
 
 C_SRCS = \
 	regapi.c
 
-all: $(PROGRAMS)
+SPEC_SRCS = \
+	regapi.spec
+
+all: check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-regapi: $(OBJS) $(WINESTUB)
+regapi: $(OBJS)
 	$(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/regapi/regapi.spec b/programs/regapi/regapi.spec
new file mode 100644
index 00000000000..fa44830dab1
--- /dev/null
+++ b/programs/regapi/regapi.spec
@@ -0,0 +1,4 @@
+name	regapi
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/regtest/.cvsignore b/programs/regtest/.cvsignore
index 30fb2b8a1dc..2d18c33dd58 100644
--- a/programs/regtest/.cvsignore
+++ b/programs/regtest/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 regtest
+regtest.spec.c
diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in
index dd14a8d381b..3078d7b6771 100644
--- a/programs/regtest/Makefile.in
+++ b/programs/regtest/Makefile.in
@@ -6,16 +6,16 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = regtest
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
 
 C_SRCS = regtest.c
 
-all: $(PROGRAMS)
+SPEC_SRCS = regtest.spec
+
+all: check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-regtest: $(OBJS) $(WINESTUB)
+regtest: $(OBJS)
 	$(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/regtest/regtest.spec b/programs/regtest/regtest.spec
new file mode 100644
index 00000000000..6838d27f8f9
--- /dev/null
+++ b/programs/regtest/regtest.spec
@@ -0,0 +1,4 @@
+name	regtest
+mode	guiexe
+type	win32
+init	WinMain
diff --git a/programs/view/.cvsignore b/programs/view/.cvsignore
index f3f6641fad2..e7bc3b6fff3 100644
--- a/programs/view/.cvsignore
+++ b/programs/view/.cvsignore
@@ -1,4 +1,4 @@
 Makefile
 view
-viewrc.h
+view.spec.c
 viewrc.s
diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in
index d70bf4d7d30..94e0b83a064 100644
--- a/programs/view/Makefile.in
+++ b/programs/view/Makefile.in
@@ -6,32 +6,24 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = view
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
+WRCEXTRA  = -s -p view
 
 C_SRCS = \
 	init.c \
 	view.c \
 	winmain.c
 
+SPEC_SRCS = \
+	view.spec
+
 RC_SRCS = \
 	viewrc.rc
 
-all: check_wrc $(PROGRAMS)
-
-depend:: $(RC_SRCS:.rc=.h)
+all: check_wrc check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-# Override resource compiler rules
-.rc.s:
-	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
-
-.rc.h:
-	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
-
-
-view: $(OBJS) $(WINESTUB)
+view: $(OBJS)
 	$(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
@@ -40,6 +32,4 @@ install::
 uninstall::
 	$(RM) $(bindir)/view
 
-$(RC_SRCS:.rc=.s): $(WRC)
-
 ### Dependencies:
diff --git a/programs/view/view.spec b/programs/view/view.spec
new file mode 100644
index 00000000000..34d2915e8b3
--- /dev/null
+++ b/programs/view/view.spec
@@ -0,0 +1,5 @@
+name	view
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	view
diff --git a/programs/wcmd/.cvsignore b/programs/wcmd/.cvsignore
index aa9cc9aa2cb..d588e377ecb 100644
--- a/programs/wcmd/.cvsignore
+++ b/programs/wcmd/.cvsignore
@@ -1,4 +1,4 @@
 Makefile
 wcmd
-wcmdrc.h
+wcmd.spec.c
 wcmdrc.s
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 526c864afd0..60df63ecc54 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -6,8 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -A -t -p $*
+WRCEXTRA  = -s -p wcmd
 
 C_SRCS = \
 	batch.c \
@@ -15,19 +14,20 @@ C_SRCS = \
 	directory.c \
 	wcmdmain.c
 
+SPEC_SRCS = \
+	wcmd.spec
+
 RC_SRCS = \
 	wcmdrc.rc
 
 all: check_wrc $(PROGRAMS)
 
-depend:: $(RC_SRCS:.rc=.h)
-
 @MAKE_RULES@
 
 #this line is needed to prevent winestub.o being linked
 WINESTUB = 
 
-wcmd: $(OBJS) $(WINESTUB)
+wcmd: $(OBJS)
 	$(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
@@ -36,6 +36,4 @@ install::
 uninstall::
 	$(RM) $(bindir)/wcmd
 
-$(RC_SRCS:.rc=.s): $(WRC)
-
 ### Dependencies:
diff --git a/programs/wcmd/wcmd.spec b/programs/wcmd/wcmd.spec
new file mode 100644
index 00000000000..a78c34d3362
--- /dev/null
+++ b/programs/wcmd/wcmd.spec
@@ -0,0 +1,4 @@
+name	wcmd
+mode    cuiexe
+type	win32
+init	main
diff --git a/programs/winhelp/.cvsignore b/programs/winhelp/.cvsignore
index 60f04904580..395405857ed 100644
--- a/programs/winhelp/.cvsignore
+++ b/programs/winhelp/.cvsignore
@@ -1,33 +1,8 @@
-Da.h
-Da.s
-De.h
-De.s
-En.h
-En.s
-Es.h
-Es.s
-Fi.h
-Fi.s
-Fr.h
-Fr.s
-Hu.h
-Hu.s
-It.h
-It.s
-Ko.h
-Ko.s
 Makefile
-Pt.h
-Pt.s
-Sw.h
-Sw.s
-Va.h
-Va.s
-Wa.h
-Wa.s
 hlp2sgml
 lex.yy.c
 rsrc.s
 winhelp
+winhelp.spec.c
 y.tab.c
 y.tab.h
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index e0cd0ee7773..17cce10019e 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -6,7 +6,7 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winhelp hlp2sgml
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA  = -t -A -p winhelp
+WRCEXTRA  = -s -p winhelp
 
 C_SRCS = \
 	winhelp.c \
@@ -14,12 +14,14 @@ C_SRCS = \
 	macro.c \
 	string.c
 
+SPEC_SRCS = winhelp.spec
+
 EXTRA_SRCS = macro.yacc.y macro.lex.l
 EXTRA_OBJS = y.tab.o lex.yy.o
 
 RC_SRCS = rsrc.rc
 
-all: check_wrc $(PROGRAMS)
+all: check_wrc check_winestub $(PROGRAMS)
 
 depend:: y.tab.h
 
@@ -29,7 +31,7 @@ depend:: y.tab.h
 .rc.s:
 	$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
 
-winhelp: $(OBJS) $(WINESTUB)
+winhelp: $(OBJS)
 	$(CC) -o winhelp $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 hlp2sgml: hlp2sgml.o hlpfile.o
diff --git a/programs/winhelp/winhelp.spec b/programs/winhelp/winhelp.spec
new file mode 100644
index 00000000000..ecc81acfded
--- /dev/null
+++ b/programs/winhelp/winhelp.spec
@@ -0,0 +1,5 @@
+name	winhelp
+mode	guiexe
+type	win32
+init	WinMain
+rsrc	winhelp
diff --git a/programs/winver/.cvsignore b/programs/winver/.cvsignore
index f5ac340a874..e4bc633e244 100644
--- a/programs/winver/.cvsignore
+++ b/programs/winver/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 winver
+winver.spec.c
diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in
index 706b6e56ff6..343ac656746 100644
--- a/programs/winver/Makefile.in
+++ b/programs/winver/Makefile.in
@@ -6,16 +6,16 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winver
 ALL_LIBS  = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-RCFLAGS   = -w32 -h
-WRCEXTRA  = -t -A -p $*
 
 C_SRCS = winver.c
 
-all: check_wrc $(PROGRAMS)
+SPEC_SRCS = winver.spec
+
+all: check_winestub $(PROGRAMS)
 
 @MAKE_RULES@
 
-winver: $(OBJS) $(WINESTUB)
+winver: $(OBJS)
 	$(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
 
 install::
diff --git a/programs/winver/winver.spec b/programs/winver/winver.spec
new file mode 100644
index 00000000000..10fe0dcecc9
--- /dev/null
+++ b/programs/winver/winver.spec
@@ -0,0 +1,4 @@
+name	winver
+mode	guiexe
+type	win32
+init	WinMain