--- a/open-src/xserver/Makefile.inc	Thu Dec 01 14:24:06 2016 -0800
+++ b/open-src/xserver/Makefile.inc	Wed Jan 04 20:18:34 2017 -0800
@@ -60,6 +60,7 @@
 	--enable-glx --enable-dri2 \
 	--disable-xsdl --disable-xwin --disable-xnest \
 	--disable-install-setuid \
+	--without-dtrace \
 	--with-vendor-name='$(VENDOR_NAME)' \
 	--with-vendor-web='$(VENDOR_SUPPORT_URL)' \
 	--with-builderstring='Solaris ABI: $(BUILD_TYPE)-bit' \

--- a/pkg/manifests/x11-server-xserver-common.p5m	Thu Dec 01 14:24:06 2016 -0800
+++ b/pkg/manifests/x11-server-xserver-common.p5m	Wed Jan 04 20:18:34 2017 -0800
@@ -53,11 +53,12 @@
 file path=usr/lib/xorg/protocol.txt
 link path=usr/share/doc/Xserver target=xorg-server
 dir  path=usr/share/doc/xorg-server
-file path=usr/share/doc/xorg-server/Xserver-DTrace.html
-file path=usr/share/doc/xorg-server/Xserver-DTrace.html.db
-file path=usr/share/doc/xorg-server/Xserver-DTrace.pdf.db
-file path=usr/share/doc/xorg-server/Xserver-DTrace.txt
-file path=usr/share/doc/xorg-server/Xserver-DTrace.xml
+# Re-deliver these once 25247220 is fixed
+#file path=usr/share/doc/xorg-server/Xserver-DTrace.html
+#file path=usr/share/doc/xorg-server/Xserver-DTrace.html.db
+#file path=usr/share/doc/xorg-server/Xserver-DTrace.pdf.db
+#file path=usr/share/doc/xorg-server/Xserver-DTrace.txt
+#file path=usr/share/doc/xorg-server/Xserver-DTrace.xml
 file path=usr/share/man/man1/Xnest.1
 file path=usr/share/man/man1/Xserver.1
 # Xserver script runs /usr/bin/readlink (from GNU coreutils)