diff --git a/man/Makefile.am b/man/Makefile.am
index b768742e8200e41c4b86b81e934cc383172b6d43..0a0b7d12cf8c97c2b4d3c4fdb5fcda774ae312bb 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,12 +1,11 @@
 libmandir = $(LIB_MAN_DIR)
 
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
 libman_xml = Xcomposite.xml
 
-libman_PRE = $(libman_xml:xml=man)
+libman_PRE = $(libman_xml:xml=man)		\
+	     $(Xcomposite_shadows:=.man)
 
-Xcomposite_man_aliases = 			\
+Xcomposite_shadows =	 			\
 	XCompositeQueryExtension		\
 	XCompositeQueryVersion			\
 	XCompositeVersion			\
@@ -19,22 +18,16 @@ Xcomposite_man_aliases = 			\
 	XCompositeGetOverlayWindow		\
 	XCompositeReleaseOverlayWindow
 
-Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
-
 if INSTALL_MANPAGES
 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(Xcomposite_shadowmen)
+	      $(Xcomposite_shadows:=.@LIB_MAN_SUFFIX@)
 endif
 
 EXTRA_DIST  = $(libman_PRE) $(libman_xml)
 
 CLEANFILES  = $(libman_DATA)
 
-MAINTAINERCLEANFILES = $(libman_PRE)
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-$(Xcomposite_shadowmen):
-	$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
+MAINTAINERCLEANFILES = $(libman_xml:xml=man)
 
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
 
diff --git a/man/XCompositeCreateRegionFromBorderClip.man b/man/XCompositeCreateRegionFromBorderClip.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeCreateRegionFromBorderClip.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeGetOverlayWindow.man b/man/XCompositeGetOverlayWindow.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeGetOverlayWindow.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeNameWindowPixmap.man b/man/XCompositeNameWindowPixmap.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeNameWindowPixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeQueryExtension.man b/man/XCompositeQueryExtension.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeQueryVersion.man b/man/XCompositeQueryVersion.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeRedirectSubwindows.man b/man/XCompositeRedirectSubwindows.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeRedirectSubwindows.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeRedirectWindow.man b/man/XCompositeRedirectWindow.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeRedirectWindow.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeReleaseOverlayWindow.man b/man/XCompositeReleaseOverlayWindow.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeReleaseOverlayWindow.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeUnredirectSubwindows.man b/man/XCompositeUnredirectSubwindows.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeUnredirectSubwindows.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeUnredirectWindow.man b/man/XCompositeUnredirectWindow.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeUnredirectWindow.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
diff --git a/man/XCompositeVersion.man b/man/XCompositeVersion.man
new file mode 100644
index 0000000000000000000000000000000000000000..789aba8c68c1798bfe4e032e151074e3e234b90d
--- /dev/null
+++ b/man/XCompositeVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__