diff --git a/Makefile.am b/Makefile.am
index b8bcdbf..8d7495e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,8 @@
 confexecdir=$(libdir)
 confexec_DATA = xmlConf.sh
 
-EXTRA_DIST = xmlConf.sh.in libxml.spec doc/*.html doc/*.gif
+EXTRA_DIST = xmlConf.sh.in libxml.spec doc/xml.html doc/structure.gif \
+             doc/DOM.gif
 
 ## We create xmlConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 059dff8..9ec4351 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,9 +31,12 @@
 maintainer-clean-local: clean
 	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 
 
-install-data-local:
-	install -d -m 0755 $(TARGET_DIR)
-	install -m 0644 xml.html structure.gif DOM.gif $(TARGET_DIR)
+docdatadir = $(datadir)/aclocal
+docdata_DATA = xml.html structure.gif DOM.gif
+
+#install-data-local:
+#	install -d -m 0755 $(TARGET_DIR)
+#	install -m 0644 xml.html structure.gif DOM.gif $(TARGET_DIR)
 #	install -m 0644 html/*.html $(TARGET_DIR)
 #	install -m 0644 html/index.sgml $(TARGET_DIR)
 #	gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)