diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 9218f816b..b9a28c6d4 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-05  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* Makefile.in: Added mansection and mansuffix variables.  Changed mandir
+  to support Cygwin man page location.
+
 2007-03-25  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* Include/_mingw.h: Increment version to 3.12.
@@ -142,7 +147,7 @@
 
 2006-11-09  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	[ mingw-Bugs-1590623 ] 
+	[ mingw-Bugs-1590623 ]
 	* include/_mingw.h (__CRT_INLINE): Use __gnu_inline__ attribute
 	in C99 mode.
 
@@ -256,7 +261,7 @@
 
 2006-07-06  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	* include/math.h (__INFF,__INFL): Remove '#'. 
+	* include/math.h (__INFF,__INFL): Remove '#'.
 
 2006-07-04  Danny Smith  <dannysmith@users.sourceforge.net>
 
@@ -264,11 +269,11 @@
 
 2006-07-03  Danny Smith  <dannysmith@users.sourceforge.net>
 
-	Support SSE float environment in fenv.h functions.  
+	Support SSE float environment in fenv.h functions.
 	* cpu_features.c: New file.
 	* cpu_features.h: New file.
 	* crt1.c: Include "cpu_features.h".
-	(__mingw_CRTStartup): Call cpu_features_init().	
+	(__mingw_CRTStartup): Call cpu_features_init().
 	* Makefile.in (MING_OBJS): Add cpu_features.c.
 	(SRCDIST_FILES): Add cpu_features.c, cpu_features.h.
 	* include/fenv,h ( fenv_t;): Append  __mxcsr field.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 06a0d62a2..a90bfe1b1 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -19,7 +19,7 @@
 
 PACKAGE = mingw-runtime
 VERSION = @PACKAGE_VERSION@
-CYGRELEASE = 1
+CYGRELEASE = 2
 
 VPATH = @srcdir@
 srcdir = @srcdir@
@@ -36,7 +36,15 @@ program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
+ifneq (,$(findstring cygwin,$(target_alias)))
+mandir = $(prefix)/share/man
+mansection = mingw
+mansuffix = mingw
+else
 mandir = @mandir@
+mansection = man3
+mansuffix = 3
+endif
 manpage_transform = @mingw_manpage_transform@
 ifeq ($(target_alias),$(host_alias))
 ifeq ($(build_alias),$(host_alias))
@@ -421,7 +429,7 @@ install-dirs:
 	$(mkinstalldirs) $(inst_includedir)
 	$(mkinstalldirs) $(inst_libdir)
 	$(mkinstalldirs) $(inst_docdir)
-	$(mkinstalldirs) $(mandir)/man3
+	$(mkinstalldirs) $(mandir)/$(mansection)
 
 install: all install-dirs $(install_dlls_host)
 	for i in $(LIBS); do \
@@ -444,11 +452,11 @@ install: all install-dirs $(install_dlls_host)
 # This provisional hack installs the only manpage we have at present...
 # It simply CANNOT suffice, when we have more manpages to ship.
 #
-	$(mkinstalldirs) $(mandir)/man3
-	$(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man3/`\
-	  echo dirname.man|sed '$(manpage_transform);s,man$$,3,'`
-	$(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/man3/`\
-	  echo basename.man|sed '$(manpage_transform);s,man$$,3,'`
+	$(mkinstalldirs) $(mandir)/$(mansection)
+	$(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/$(mansection)/`\
+	  echo dirname.man|sed '$(manpage_transform);s,man$$,$(mansuffix),'`
+	$(INSTALL_DATA) $(srcdir)/man/dirname.man $(mandir)/$(mansection)/`\
+	  echo basename.man|sed '$(manpage_transform);s,man$$,$(mansuffix),'`
 #
 # End provisional hack.
 #