diff --git a/Make.rules.in b/Make.rules.in
index 0e89c0126dd..cf3de03a3d6 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -136,7 +136,7 @@ DLLS = \
 	wing \
 	wininet \
 	winmm \
-	winspool \
+	winspool.drv \
 	wnaspi32 \
 	wsock32 \
 	x11drv
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index f976c99415c..54607615b28 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -57,7 +57,7 @@ DLLFILES = \
 	winmm/wavemap/libmsacm.drv.@LIBEXT@ \
 	winmm/wineoss/libwineoss.drv.@LIBEXT@ \
 	winsock/libwsock32.@LIBEXT@ \
-	winspool/libwinspool.@LIBEXT@ \
+	winspool/libwinspool.drv.@LIBEXT@ \
 	x11drv/libx11drv.@LIBEXT@
 
 # extra names for dlls containing multiple spec files
@@ -293,8 +293,8 @@ libwininet.@LIBEXT@: wininet/libwininet.@LIBEXT@
 libwinmm.@LIBEXT@ libmmsystem.@LIBEXT@: winmm/libwinmm.@LIBEXT@
 	$(RM) $@ && $(LN_S) winmm/libwinmm.@LIBEXT@ $@
 
-libwinspool.@LIBEXT@: winspool/libwinspool.@LIBEXT@
-	$(RM) $@ && $(LN_S) winspool/libwinspool.@LIBEXT@ $@
+libwinspool.drv.@LIBEXT@: winspool/libwinspool.drv.@LIBEXT@
+	$(RM) $@ && $(LN_S) winspool/libwinspool.drv.@LIBEXT@ $@
 
 libwnaspi32.@LIBEXT@ libwinaspi.@LIBEXT@: winaspi/libwnaspi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) winaspi/libwnaspi32.@LIBEXT@ $@
@@ -308,7 +308,7 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
 # Inter-dll dependencies (only necessary for .so)
 
 avifil32/libavifil32.so: libmsvfw32.so libwinmm.so
-commdlg/libcomdlg32.so: libwinspool.so
+commdlg/libcomdlg32.so: libwinspool.drv.so
 ddraw/libddraw.so: libx11drv.so
 dplayx/libdplayx.so: libole32.so
 msvideo/libmsvfw32.so: libwinmm.so
diff --git a/dlls/commdlg/Makefile.in b/dlls/commdlg/Makefile.in
index 632ab8a1aa2..73ba21ffa19 100644
--- a/dlls/commdlg/Makefile.in
+++ b/dlls/commdlg/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 MODULE    = comdlg32
 SOVERSION = 1.0
 ALTNAMES  = commdlg
-IMPORTS   = winspool
+IMPORTS   = winspool.drv
 WRCEXTRA  = -s -pcomdlg32
 
 SPEC_SRCS = commdlg.spec comdlg32.spec
diff --git a/dlls/winspool/.cvsignore b/dlls/winspool/.cvsignore
index 818ae497e76..6a1bed30617 100644
--- a/dlls/winspool/.cvsignore
+++ b/dlls/winspool/.cvsignore
@@ -1,3 +1,3 @@
 *.spec.c
 Makefile
-libwinspool.so.1.0
+libwinspool.drv.so.1.0
diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in
index c948ec55fc6..ec7e9623202 100644
--- a/dlls/winspool/Makefile.in
+++ b/dlls/winspool/Makefile.in
@@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = winspool
+MODULE    = winspool.drv
 SOVERSION = 1.0
 
 SPEC_SRCS = winspool.spec