diff --git a/loader/wine.man.in b/loader/wine.man.in
index 0d92ea4c796..927bbe37d12 100644
--- a/loader/wine.man.in
+++ b/loader/wine.man.in
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH WINE 1 "June 2005" "@PACKAGE_STRING@" "Windows On Unix"
+.TH WINE 1 "October 2005" "@PACKAGE_STRING@" "Windows On Unix"
 .SH NAME
 wine \- run Windows programs on Unix
 .SH SYNOPSIS
diff --git a/programs/winedbg/.cvsignore b/programs/winedbg/.cvsignore
index ecbd85ec9fd..6bef64dcf97 100644
--- a/programs/winedbg/.cvsignore
+++ b/programs/winedbg/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 dbg.tab.c
 dbg.tab.h
 lex.yy.c
+winedbg.man
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 80fa2d4b7cd..7fea44635ad 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -29,8 +29,12 @@ C_SRCS = \
 EXTRA_SRCS = dbg.y debug.l
 EXTRA_OBJS = dbg.tab.o @LEX_OUTPUT_ROOT@.o
 
+MANPAGES = winedbg.man
+
 @MAKE_PROG_RULES@
 
+all: $(MANPAGES)
+
 dbg.tab.c dbg.tab.h: dbg.y
 	$(BISON) -d -t $(SRCDIR)/dbg.y -o dbg.tab.c
 
@@ -43,9 +47,9 @@ dbg.tab.o: dbg.tab.h
 
 @LEX_OUTPUT_ROOT@.o: dbg.tab.h
 
-install::
+install:: $(MANPAGES)
 	$(MKINSTALLDIRS) $(mandir)/man$(prog_manext)
-	$(INSTALL_DATA) $(SRCDIR)/winedbg.man $(mandir)/man$(prog_manext)/winedbg.$(prog_manext)
+	$(INSTALL_DATA) winedbg.man $(mandir)/man$(prog_manext)/winedbg.$(prog_manext)
 
 uninstall::
 	$(RM) $(mandir)/man$(prog_manext)/winedbg.$(prog_manext)
diff --git a/programs/winedbg/winedbg.man b/programs/winedbg/winedbg.man.in
similarity index 99%
rename from programs/winedbg/winedbg.man
rename to programs/winedbg/winedbg.man.in
index b6529395db9..916749603d9 100644
--- a/programs/winedbg/winedbg.man
+++ b/programs/winedbg/winedbg.man.in
@@ -1,4 +1,5 @@
-.TH WINEDBG 1 "May 2004" "Wine Manpage" "Wine Developers Manual"
+.\" -*- nroff -*-
+.TH WINEDBG 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 winedbg \- Wine's debugger
 .SH SYNOPSIS
diff --git a/server/wineserver.man.in b/server/wineserver.man.in
index 49a922e6208..330adbd998d 100644
--- a/server/wineserver.man.in
+++ b/server/wineserver.man.in
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH WINESERVER 1 "September 2005" "@PACKAGE_STRING@" "Wine server"
+.TH WINESERVER 1 "October 2005" "@PACKAGE_STRING@" "Windows on Unix"
 .SH NAME
 wineserver \- the Wine server
 .SH SYNOPSIS
diff --git a/tools/.cvsignore b/tools/.cvsignore
index c01b5af3717..d811816f55d 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -5,4 +5,5 @@ fnt2fon
 make_ctests
 makedep
 sfnt2fnt
+winemaker.man
 wineprefixcreate
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3781c6c8844..87abea3ea7c 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -17,6 +17,9 @@ PROGRAMS = \
 	sfnt2fnt$(EXEEXT) \
 	wineprefixcreate
 
+MANPAGES = \
+	winemaker.man
+
 C_SRCS = \
 	bin2res.c \
 	fnt2bdf.c \
@@ -39,7 +42,7 @@ SUBDIRS = \
 
 UPDATE_DESKTOP_DATABASE = update-desktop-database
 
-all: $(PROGRAMS) $(SUBDIRS)
+all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS)
 
 @MAKE_RULES@
 
@@ -72,10 +75,10 @@ install install-lib:: wineprefixcreate
 	$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(datadir)/applications/wine.desktop
 	-$(UPDATE_DESKTOP_DATABASE)
 
-install install-dev:: $(INSTALLSUBDIRS:%=%/__install__)
+install install-dev:: $(INSTALLSUBDIRS:%=%/__install__) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
 	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
-	$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
+	$(INSTALL_DATA) winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
 
 uninstall::
 	$(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
diff --git a/tools/widl/.cvsignore b/tools/widl/.cvsignore
index 94dace7be9b..7acd41a8533 100644
--- a/tools/widl/.cvsignore
+++ b/tools/widl/.cvsignore
@@ -3,3 +3,4 @@ lex.yy.c
 parser.tab.c
 parser.tab.h
 widl
+widl.man
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
index ff8ac5bdad7..aaa2825f3b7 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -6,6 +6,7 @@ LEXOPT    = -Cf #-w -b
 EXEEXT    = @EXEEXT@
 
 PROGRAMS = widl$(EXEEXT)
+MANPAGES = widl.man
 MODULE   = none
 
 C_SRCS = \
@@ -22,7 +23,7 @@ C_SRCS = \
 EXTRA_SRCS = parser.y parser.l
 EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
 
@@ -41,10 +42,10 @@ parser.tab.o: parser.tab.h
 
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
-install:: $(PROGRAMS)
+install:: $(PROGRAMS) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) widl$(EXEEXT) $(bindir)/widl$(EXEEXT)
-	$(INSTALL_DATA) $(SRCDIR)/widl.man $(mandir)/man$(prog_manext)/widl.$(prog_manext)
+	$(INSTALL_DATA) widl.man $(mandir)/man$(prog_manext)/widl.$(prog_manext)
 
 uninstall::
 	$(RM) $(bindir)/widl$(EXEEXT) $(mandir)/man$(prog_manext)/widl.$(prog_manext)
diff --git a/tools/widl/widl.man b/tools/widl/widl.man.in
similarity index 96%
rename from tools/widl/widl.man
rename to tools/widl/widl.man.in
index 86dc046d512..98684671435 100644
--- a/tools/widl/widl.man
+++ b/tools/widl/widl.man.in
@@ -1,4 +1,5 @@
-.TH WIDL 1 "March 2004" "Wine Manpage" "Wine Developers Manual"
+.\" -*- nroff -*-
+.TH WIDL 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 widl \- Wine Interface Definition Language Compiler
 .SH SYNOPSIS
diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in
index 9748c1e35df..a682a10646b 100644
--- a/tools/winebuild/winebuild.man.in
+++ b/tools/winebuild/winebuild.man.in
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH WINEBUILD 1 "September 2005" "@PACKAGE_STRING@" "Wine dll builder"
+.TH WINEBUILD 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 winebuild \- Wine dll builder
 .SH SYNOPSIS
diff --git a/tools/winedump/.cvsignore b/tools/winedump/.cvsignore
index a56be2446b1..90f62f6f681 100644
--- a/tools/winedump/.cvsignore
+++ b/tools/winedump/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 winedump
+winedump.man
diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in
index 18aac731501..f6670aed9c4 100644
--- a/tools/winedump/Makefile.in
+++ b/tools/winedump/Makefile.in
@@ -5,7 +5,7 @@ VPATH     = @srcdir@
 EXEEXT    = @EXEEXT@
 
 PROGRAMS = winedump$(EXEEXT)
-
+MANPAGES = winedump.man
 MODULE   = none
 
 C_SRCS = \
@@ -24,17 +24,17 @@ C_SRCS = \
 	search.c \
 	symbol.c
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
 
 winedump$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) -o winedump$(EXEEXT) $(OBJS) $(LIBPORT) $(LDFLAGS)
 
-install:: $(PROGRAMS)
+install:: $(PROGRAMS) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) winedump$(EXEEXT) $(bindir)/winedump$(EXEEXT)
-	$(INSTALL_DATA) $(SRCDIR)/winedump.man $(mandir)/man$(prog_manext)/winedump.$(prog_manext)
+	$(INSTALL_DATA) winedump.man $(mandir)/man$(prog_manext)/winedump.$(prog_manext)
 	$(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl
 
 uninstall::
diff --git a/tools/winedump/winedump.man b/tools/winedump/winedump.man.in
similarity index 98%
rename from tools/winedump/winedump.man
rename to tools/winedump/winedump.man.in
index a9b8a0dcd6b..19fd8de446b 100644
--- a/tools/winedump/winedump.man
+++ b/tools/winedump/winedump.man.in
@@ -1,4 +1,5 @@
-.TH WINEDUMP 1 "February 2004" "Wine Manpage" "Wine Developers Manual"
+.\" -*- nroff -*-
+.TH WINEDUMP 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 winedump \- A Wine DLL tool
 .SH SYNOPSIS
diff --git a/tools/winegcc/.cvsignore b/tools/winegcc/.cvsignore
index 011635b8bed..871be760edc 100644
--- a/tools/winegcc/.cvsignore
+++ b/tools/winegcc/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 winegcc
+winegcc.man
diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in
index c581d3f80a4..40c43c0257c 100644
--- a/tools/winegcc/Makefile.in
+++ b/tools/winegcc/Makefile.in
@@ -23,11 +23,13 @@ PROGRAMS = \
 	winegcc$(EXEEXT) \
 	wineg++$(EXEEXT)
 
+MANPAGES = winegcc.man
+
 C_SRCS = \
 	utils.c \
 	winegcc.c
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
 
@@ -37,12 +39,12 @@ winegcc$(EXEEXT): winegcc.o utils.o
 winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT)
 	$(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@
 
-install:: $(PROGRAMS)
+install:: $(PROGRAMS) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
 	$(INSTALL_PROGRAM) winegcc$(EXEEXT) $(bindir)/winegcc$(EXEEXT)
 	cd $(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT)
 	cd $(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT)
-	$(INSTALL_DATA) $(SRCDIR)/winegcc.man $(mandir)/man$(prog_manext)/winegcc.$(prog_manext)
+	$(INSTALL_DATA) winegcc.man $(mandir)/man$(prog_manext)/winegcc.$(prog_manext)
 	cd $(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext)
 
 uninstall::
diff --git a/tools/winegcc/winegcc.man b/tools/winegcc/winegcc.man.in
similarity index 97%
rename from tools/winegcc/winegcc.man
rename to tools/winegcc/winegcc.man.in
index 781f4759edd..2d3567e006d 100644
--- a/tools/winegcc/winegcc.man
+++ b/tools/winegcc/winegcc.man.in
@@ -1,4 +1,5 @@
-.TH WINEGCC 1 "January 2005" "Wine Manpage" "Wine Developers Manual"
+.\" -*- nroff -*-
+.TH WINEGCC 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 winegcc \- Wine C and C++ MinGW Compatible Compiler
 .SH SYNOPSIS
diff --git a/tools/winemaker.man b/tools/winemaker.man.in
similarity index 99%
rename from tools/winemaker.man
rename to tools/winemaker.man.in
index 4555437fdb8..fc57a3c69fa 100644
--- a/tools/winemaker.man
+++ b/tools/winemaker.man.in
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH WINEMAKER 1 "September 27, 2001" "Version 0.5.8" "Windows On Unix"
+.TH WINEMAKER 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 winemaker \- generate a build infrastructure for compiling Windows programs on Unix
 .SH SYNOPSIS
diff --git a/tools/wmc/.cvsignore b/tools/wmc/.cvsignore
index e7e9b33a834..c30788d9c05 100644
--- a/tools/wmc/.cvsignore
+++ b/tools/wmc/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 mcy.tab.c
 mcy.tab.h
 wmc
+wmc.man
diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in
index 1b1ad039791..6ba4d2a8ad5 100644
--- a/tools/wmc/Makefile.in
+++ b/tools/wmc/Makefile.in
@@ -5,6 +5,7 @@ VPATH     = @srcdir@
 EXEEXT    = @EXEEXT@
 
 PROGRAMS = wmc$(EXEEXT)
+MANPAGES = wmc.man
 MODULE   = none
 
 C_SRCS = \
@@ -17,7 +18,7 @@ C_SRCS = \
 EXTRA_SRCS = mcy.y
 EXTRA_OBJS = mcy.tab.o
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(MANPAGES)
 
 mcl.o: mcy.tab.h
 
@@ -33,9 +34,9 @@ mcy.tab.c mcy.tab.h: mcy.y
 mcy.tab.h: mcy.tab.c
 mcy.tab.o: mcy.tab.h
 
-install:: $(PROGRAMS)
+install:: $(PROGRAMS) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_DATA) $(SRCDIR)/wmc.man $(mandir)/man$(prog_manext)/wmc.$(prog_manext)
+	$(INSTALL_DATA) wmc.man $(mandir)/man$(prog_manext)/wmc.$(prog_manext)
 	$(INSTALL_PROGRAM) wmc$(EXEEXT) $(bindir)/wmc$(EXEEXT)
 
 uninstall::
diff --git a/tools/wmc/wmc.man b/tools/wmc/wmc.man.in
similarity index 97%
rename from tools/wmc/wmc.man
rename to tools/wmc/wmc.man.in
index d8da0a81fb1..349112556b7 100644
--- a/tools/wmc/wmc.man
+++ b/tools/wmc/wmc.man.in
@@ -1,4 +1,5 @@
-.TH WMC 1 "June 12, 2000" "Version 1.0.0" "Wine Message Compiler"
+.\" -*- nroff -*-
+.TH WMC 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 wrc \- Wine Message Compiler
 .SH SYNOPSIS
diff --git a/tools/wrc/.cvsignore b/tools/wrc/.cvsignore
index af1bb91c583..ae39a88532e 100644
--- a/tools/wrc/.cvsignore
+++ b/tools/wrc/.cvsignore
@@ -3,3 +3,4 @@ lex.yy.c
 parser.tab.c
 parser.tab.h
 wrc
+wrc.man
diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in
index c6f8bf8f15e..49c913e2a59 100644
--- a/tools/wrc/Makefile.in
+++ b/tools/wrc/Makefile.in
@@ -7,6 +7,7 @@ LEXOPT    = -Cf #-w -b
 EXEEXT    = @EXEEXT@
 
 PROGRAMS = wrc$(EXEEXT)
+MANPAGES = wrc.man
 MODULE   = none
 
 C_SRCS = \
@@ -22,7 +23,7 @@ C_SRCS = \
 EXTRA_SRCS = parser.y parser.l
 EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o
 
-all: $(PROGRAMS)
+all: $(PROGRAMS) $(MANPAGES)
 
 @MAKE_RULES@
 
@@ -41,9 +42,9 @@ parser.tab.o: parser.tab.h
 
 @LEX_OUTPUT_ROOT@.o: parser.tab.h
 
-install:: $(PROGRAMS)
+install:: $(PROGRAMS) $(MANPAGES)
 	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
-	$(INSTALL_DATA) $(SRCDIR)/wrc.man $(mandir)/man$(prog_manext)/wrc.$(prog_manext)
+	$(INSTALL_DATA) wrc.man $(mandir)/man$(prog_manext)/wrc.$(prog_manext)
 	$(INSTALL_PROGRAM) wrc$(EXEEXT) $(bindir)/wrc$(EXEEXT)
 
 uninstall::
diff --git a/tools/wrc/wrc.man b/tools/wrc/wrc.man.in
similarity index 98%
rename from tools/wrc/wrc.man
rename to tools/wrc/wrc.man.in
index 6a0a74f0217..7dfefc025ba 100644
--- a/tools/wrc/wrc.man
+++ b/tools/wrc/wrc.man.in
@@ -1,4 +1,5 @@
-.TH WRC 1 "August 24, 2000" "Version 1.1.8" "Wine Resource Compiler"
+.\" -*- nroff -*-
+.TH WRC 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual"
 .SH NAME
 wrc \- Wine Resource Compiler
 .SH SYNOPSIS
@@ -133,9 +134,7 @@ __WRC__         Major version of wrc
 .br
 __WRC_MINOR__   Minor version of wrc
 .br
-__WRC_MICRO__   Patch level
-.br
-__WRC_PATCH__   Same as __WRC_MICRO__
+__WRC_PATCHLEVEL__   Patch level
 .PP
 Win32 compilation mode also sets __WIN32__ to 1 and __FLAT__ to 1.
 .PP