--- a/open-src/common/Makefile.inc	Wed Feb 12 14:00:18 2014 -0800
+++ b/open-src/common/Makefile.inc	Fri Feb 14 14:06:04 2014 -0800
@@ -1,6 +1,6 @@
 # -*- Makefile -*- rules commonly shared among X consolidation open source dirs
 #
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -510,7 +510,7 @@
 
 # Command line options to GNU autoconf configure script
 DEFAULT_CONFIG_OPTS = --prefix=$(MODULE_PREFIX) \
-	--without-xmlto --without-asciidoc --without-fop \
+	--without-xmlto --with-asciidoc --without-fop \
 	--mandir='$${prefix}/share/man' --localstatedir=/var
 
 CONFIG_OPTS = $(DEFAULT_CONFIG_OPTS) \

--- a/pkg/manifests/developer-opensolaris-X.p5m	Wed Feb 12 14:00:18 2014 -0800
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Fri Feb 14 14:06:04 2014 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -77,7 +77,8 @@
 # Xserver build includes mdb modules
 depend type=require fmri=pkg:/developer/debug/mdb
 
-# Tools needed to process DocBook docs
+# Tools needed to process upstream docs
+depend type=require fmri=pkg:/developer/documentation-tool/asciidoc
 depend type=require fmri=pkg:/developer/documentation-tool/openjade
 depend type=require fmri=pkg:/developer/documentation-tool/opensp
 

--- a/pkg/manifests/x11-header-x11-protocols.p5m	Wed Feb 12 14:00:18 2014 -0800
+++ b/pkg/manifests/x11-header-x11-protocols.p5m	Fri Feb 14 14:06:04 2014 -0800
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -185,6 +185,11 @@
 file path=usr/share/doc/fixesproto/fixesproto.txt
 dir  path=usr/share/doc/fontsproto
 file path=usr/share/doc/fontsproto/fsproto.xml
+dir  path=usr/share/doc/inputproto
+file path=usr/share/doc/inputproto/XI2proto.html
+file path=usr/share/doc/inputproto/XI2proto.txt
+file path=usr/share/doc/inputproto/XIproto.html
+file path=usr/share/doc/inputproto/XIproto.txt
 dir  path=usr/share/doc/kbproto
 file path=usr/share/doc/kbproto/XKBproto-1.svg
 file path=usr/share/doc/kbproto/XKBproto-10.svg