diff -urN xorg-docs-1.1.orig/configure.ac xorg-docs-1.1/configure.ac
--- xorg-docs-1.1.orig/configure.ac	2006-04-03 16:47:05.000000000 -0700
+++ xorg-docs-1.1/configure.ac	2006-04-03 16:47:11.000000000 -0700
@@ -34,6 +34,9 @@
 AC_SUBST([X11DOCDIR])
 AC_SUBST([HARDCOPYDIR])
 
+AC_ARG_ENABLE(non-man-docs,            AS_HELP_STRING([--enable-non-man-docs], [Install extra (non-man) documentation (default: no)]), [NONMAN=$enableval], [NONMAN=no])
+AM_CONDITIONAL(NONMAN, [test "x$NONMAN" = xyes])
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
diff -urN xorg-docs-1.1.orig/Makefile.am xorg-docs-1.1/Makefile.am
--- xorg-docs-1.1.orig/Makefile.am	2006-04-03 16:47:05.000000000 -0700
+++ xorg-docs-1.1/Makefile.am	2006-04-03 16:47:36.000000000 -0700
@@ -20,7 +20,11 @@
 #
 #  Process this file with autoconf to create configure.
 
+if NONMAN
 SUBDIRS = hardcopy man sgml
+else
+SUBDIRS = man
+endif
 x11docdir = @X11DOCDIR@
 
 dist_x11doc_DATA = MAINTAINERS