diff --git a/.gitignore b/.gitignore
index 72390a0c3..94a12fdc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ core
 # 
 doltcompile
 doltlibtool
+xserver.ent
diff --git a/configure.ac b/configure.ac
index ba6bacb7f..9d0854f71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2154,7 +2154,6 @@ dix/Makefile
 doc/Makefile
 doc/dtrace/Makefile
 doc/xml/Makefile
-doc/xml/xserver.ent
 man/Makefile
 fb/Makefile
 record/Makefile
@@ -2244,5 +2243,6 @@ hw/kdrive/linux/Makefile
 hw/kdrive/src/Makefile
 test/Makefile
 test/xi2/Makefile
+xserver.ent
 xorg-server.pc
 ])
diff --git a/devbook.am b/devbook.am
index dbc9d8afa..4e23bb78e 100644
--- a/devbook.am
+++ b/devbook.am
@@ -30,7 +30,7 @@ if HAVE_STYLESHEETS
 # The location where all cross reference databases are installed
 XMLTO_FLAGS =						\
 	--searchpath "$(XORG_SGML_PATH)/X11"		\
-	--searchpath "$(abs_top_builddir)/doc/xml"	\
+	--searchpath "$(abs_top_builddir)"		\
 	--stringparam current.docid="$(<:.xml=)"
 
 XMLTO_XHTML_FLAGS = \
diff --git a/doc/xml/.gitignore b/doc/xml/.gitignore
index 496173835..3f0ed1358 100644
--- a/doc/xml/.gitignore
+++ b/doc/xml/.gitignore
@@ -1,5 +1,3 @@
-#		Add & Override for this directory and its subdirectories
-xserver.ent
 Xserver-spec.html
 Xserver-spec.pdf
 Xserver-spec.txt
diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
index f6a2e4f7a..8b227610c 100644
--- a/doc/xml/xmlrules.in
+++ b/doc/xml/xmlrules.in
@@ -27,7 +27,7 @@
 # It is included by xmlrules-noinst for non installable developer's documentation
 # If the server version or release date changes, autogen && make
 
-XML_ENT_DIR = $(abs_top_builddir)/doc/xml
+XML_ENT_DIR = $(abs_top_builddir)
 SUFFIXES = .xml .txt .html .pdf
 
 XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)
diff --git a/docbook.am b/docbook.am
index 50a542efb..7ab7a0050 100644
--- a/docbook.am
+++ b/docbook.am
@@ -32,7 +32,7 @@ sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
 masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
 XMLTO_FLAGS =							\
 	--searchpath "$(XORG_SGML_PATH)/X11"			\
-	--searchpath "$(abs_top_builddir)/doc/xml"		\
+	--searchpath "$(abs_top_builddir)"			\
 	--stringparam target.database.document=$(masterdb)	\
 	--stringparam current.docid="$(<:.xml=)"		\
 	--stringparam collect.xref.targets="no"
diff --git a/doc/xml/xserver.ent.in b/xserver.ent.in
similarity index 100%
rename from doc/xml/xserver.ent.in
rename to xserver.ent.in