diff --git a/Make.rules.in b/Make.rules.in
index 2f1b34445c4..f7fe8acfed5 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -57,7 +57,7 @@ WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
 BUILD     = $(TOPOBJDIR)/tools/build@PROGEXT@
 MAKEDEP   = $(TOPOBJDIR)/tools/makedep@PROGEXT@
 WRC       = $(TOPOBJDIR)/tools/wrc/wrc@PROGEXT@
-WRCFLAGS  = -c
+WRCFLAGS  = -c -s -p $*
 DLLDIR    = $(TOPOBJDIR)/dlls
 @SET_MAKE@
 
diff --git a/debugger/Makefile.in b/debugger/Makefile.in
index 93ccfa6cc3e..2e9f193c7b0 100644
--- a/debugger/Makefile.in
+++ b/debugger/Makefile.in
@@ -5,7 +5,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = winedbg
-WRCEXTRA  = -A -p $*
 
 C_SRCS = \
 	break.c \
diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in
index d933b2ffe41..5b354134bce 100644
--- a/dlls/richedit/Makefile.in
+++ b/dlls/richedit/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = riched32
 SOVERSION = 1.0
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = riched32.spec
 
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index bcfcc8b67d0..c482f20e20c 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = shell32
 SOVERSION = 1.0
 ALTNAMES  = shell shlwapi
 IMPORTS   = ole32
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = \
 	shell.spec \
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 29056811f25..266151576ab 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -1,7 +1,7 @@
 name	shell32
 type	win32
 init	Shell32LibMain
-rsrc	shell32
+rsrc	shres
 
 import	user32.dll
 import	comctl32.dll
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 054fde4606d..9b2fdad7bcb 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = urlmon
 SOVERSION = 1.0
 IMPORTS   = ole32
-WRCEXTRA  = -s -p$(MODULE)
 
 SPEC_SRCS = urlmon.spec
 
diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index 79fbdc1456e..4457749542f 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = winmm
 SOVERSION = 1.0
 ALTNAMES  = mmsystem
-WRCEXTRA  = -s -pwinmm
 
 SPEC_SRCS = \
 	mmsystem.spec \
diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec
index 8317eaacaca..8e07f43ebdc 100644
--- a/dlls/winmm/winmm.spec
+++ b/dlls/winmm/winmm.spec
@@ -1,7 +1,7 @@
 name winmm
 type win32
 init WINMM_LibMain
-rsrc winmm
+rsrc winmm_res
 
 # ordinal exports
 1 stdcall @(ptr long long) PlaySoundA
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 7e6b76f2a44..d62f415ca58 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
-WRCEXTRA  = -s -p $*
 
 SPEC_SRCS = \
 	expand.spec \
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 63d8d24cd31..9cce6bfd2ed 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -6,7 +6,6 @@ VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = icinfo aviinfo aviplay
 IMPORTS   = msvfw32 winmm ddraw x11drv
-WRCEXTRA  = -s -p $*
 
 SPEC_SRCS = \
 	icinfo.spec \
diff --git a/resources/Makefile.in b/resources/Makefile.in
index 388a1e6eec8..8300b87f287 100644
--- a/resources/Makefile.in
+++ b/resources/Makefile.in
@@ -4,7 +4,6 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = resources
-WRCEXTRA  = -s -puser32
 
 RC_SRCS = \
 	user32.rc