diff --git a/configure b/configure
index fd09324bc348f761150affc4f5f2c41187c574d8..534afffe807c5d3928184c08d55239821ee16d97 100755
--- a/configure
+++ b/configure
@@ -18151,12 +18151,13 @@ wine_fn_config_program wusa enable_wusa install
 wine_fn_config_program xcopy enable_xcopy install,po
 wine_fn_config_test programs/xcopy/tests xcopy.exe_test
 wine_fn_config_makefile server enable_server clean,install-lib,manpage
-wine_fn_config_tool tools clean,install-dev,manpage
+wine_fn_config_tool tools clean
 wine_fn_config_tool tools/sfnt2fon clean
 wine_fn_config_tool tools/widl clean,install-dev,manpage
 wine_fn_config_tool tools/winebuild clean,install-dev,manpage
 wine_fn_config_tool tools/winedump clean,install-dev,manpage
 wine_fn_config_tool tools/winegcc clean,install-dev,manpage
+wine_fn_config_tool tools/winemaker install-dev,manpage
 wine_fn_config_tool tools/wmc clean,install-dev,manpage
 wine_fn_config_tool tools/wrc clean,install-dev,manpage
 
diff --git a/configure.ac b/configure.ac
index 3180407bfc7b70a7f1ade5c46fc84f8389f6e4b3..cdc68feecf72deee31e8105de31797e61e96d8cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3600,12 +3600,13 @@ WINE_CONFIG_PROGRAM(wusa,,[install])
 WINE_CONFIG_PROGRAM(xcopy,,[install,po])
 WINE_CONFIG_TEST(programs/xcopy/tests)
 WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage])
-WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage])
+WINE_CONFIG_TOOL(tools,[clean])
 WINE_CONFIG_TOOL(tools/sfnt2fon,[clean])
 WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/winegcc,[clean,install-dev,manpage])
+WINE_CONFIG_TOOL(tools/winemaker,[install-dev,manpage])
 WINE_CONFIG_TOOL(tools/wmc,[clean,install-dev,manpage])
 WINE_CONFIG_TOOL(tools/wrc,[clean,install-dev,manpage])
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2ed8179ad266a6bd7c1611bc2c3dbd8ebbe527e3..bc13cc9013f08bb15a7dd17cf061e0234ab73fe7 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,11 +1,6 @@
 PROGRAMS = \
 	make_xftmpl
 
-MANPAGES = \
-	winemaker.de.UTF-8.man.in \
-	winemaker.fr.UTF-8.man.in \
-	winemaker.man.in
-
 C_SRCS = \
 	make_xftmpl.c
 
@@ -13,11 +8,3 @@ IN_SRCS = \
 	wineapploader.in
 
 all: wineapploader
-
-.PHONY: install install-dev uninstall
-
-install install-dev:: install-man-pages
-	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
-
-uninstall::
-	$(RM) $(DESTDIR)$(bindir)/winemaker
diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..7095ecf0dde122834a46b3dcb3857f0f3f3dc9bb
--- /dev/null
+++ b/tools/winemaker/Makefile.in
@@ -0,0 +1,12 @@
+MANPAGES = \
+	winemaker.de.UTF-8.man.in \
+	winemaker.fr.UTF-8.man.in \
+	winemaker.man.in
+
+.PHONY: install install-dev uninstall
+
+install install-dev:: install-man-pages
+	$(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker
+
+uninstall::
+	$(RM) $(DESTDIR)$(bindir)/winemaker
diff --git a/tools/winemaker b/tools/winemaker/winemaker
similarity index 100%
rename from tools/winemaker
rename to tools/winemaker/winemaker
diff --git a/tools/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in
similarity index 100%
rename from tools/winemaker.de.UTF-8.man.in
rename to tools/winemaker/winemaker.de.UTF-8.man.in
diff --git a/tools/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in
similarity index 100%
rename from tools/winemaker.fr.UTF-8.man.in
rename to tools/winemaker/winemaker.fr.UTF-8.man.in
diff --git a/tools/winemaker.man.in b/tools/winemaker/winemaker.man.in
similarity index 100%
rename from tools/winemaker.man.in
rename to tools/winemaker/winemaker.man.in