diff --git a/.gitignore b/.gitignore
index 4c866b9c55e..a50576135ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -269,6 +269,7 @@ programs/rpcss/irot.h
 programs/rpcss/irot_s.c
 programs/services/svcctl.h
 programs/services/svcctl_s.c
+programs/winecfg/winecfg.man
 programs/winedbg/dbg.tab.c
 programs/winedbg/dbg.tab.h
 programs/winedbg/debug.yy.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index a23d8bdc6c3..0185196f39a 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -43,8 +43,20 @@ RC_SRCS = \
 	Zh.rc \
 	winecfg.rc
 
+MANPAGES = winecfg.man
+
 SVG_SRCS = \
 	logo.svg \
 	winecfg.svg
 
 @MAKE_PROG_RULES@
+
+all: $(MANPAGES)
+
+install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext)
+	$(INSTALL_DATA) winecfg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext)
+
+@WOW64_DISABLE@ install install-lib:: install-man-pages
+
+uninstall::
+	$(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winecfg.$(prog_manext)
diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in
new file mode 100644
index 00000000000..0c562385c48
--- /dev/null
+++ b/programs/winecfg/winecfg.man.in
@@ -0,0 +1,13 @@
+.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs"
+.SH NAME
+winecfg \- Wine Configuration Editor
+.SH SYNOPSIS
+.BR "winecfg"
+.SH DESCRIPTION
+.B winecfg
+is the Wine configuration editor. It allows you to change several settings, such as DLL load order
+(native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver,
+among others. Many of these settings can be made on a per application basis, for example, preferring native
+riched20.dll for wordpad.exe, but not for notepad.exe.
+.SH "SEE ALSO"
+.BR wine(1)