--- a/Makefile	Tue Jan 24 13:23:44 2006 -0500
+++ b/Makefile	Thu Jan 26 16:51:15 2006 -0500
@@ -10,13 +10,17 @@
 NWALSH_XSL_DIR=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
 OUTPUT=$(foreach target,$(basename $(SRCS)),$(call output,$(target)))
 UPLOAD=$(OUTPUT)
+xml_validate=xmllint --xinclude $(1) |			\
+	sed -e 's/\(xmlns:xi\|xml:base\)="[^"]*"//g' |	\
+	xmllint --valid --noout - 2>&1 | sed 's/^-:/$(1):/'
+html_validate=true
 
 all: $(basename $(SRCS))
 
 validate: $(addsuffix -validate,$(SRCS))
 
 $(addsuffix -validate,$(SRCS)):
-	xmllint --xinclude --postvalid --noout $(subst -validate,,$@)
+	$(call xml_validate,$(subst -validate,,$@))
 
 cthulhu_19e: $(call targets,cthulhu_19e)