diff --git a/doc/Makefile.am b/doc/Makefile.am
index e7eec1ff9231cc1062c519644320f41edae11708..3dd47b92c89ff6993566901c2b0ac98962cfadf6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,11 +2,8 @@
 
 SUBDIRS = libogg
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
-doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
+dist_html_DATA = framing.html index.html oggstream.html ogg-multiplex.html \
 	fish_xiph_org.png multiplex1.png packets.png pages.png stream.png \
 	vorbisword2.png white-ogg.png white-xifish.png \
 	rfc3533.txt rfc5334.txt skeleton.html
 
-EXTRA_DIST = $(doc_DATA)
diff --git a/doc/libogg/Makefile.am b/doc/libogg/Makefile.am
index 9139391553a2964688cc5aefd8f32ea6f3c3337e..7ecd26a3b72e16a98d51a9d46a8dd27fc470f5d5 100644
--- a/doc/libogg/Makefile.am
+++ b/doc/libogg/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libogg
+apidocdir = $(htmldir)/libogg
 
-doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
+dist_apidoc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
 	general.html index.html ogg_iovec_t.html ogg_packet.html ogg_packet_clear.html\
 	ogg_page.html ogg_page_bos.html ogg_page_checksum_set.html\
 	ogg_page_continued.html ogg_page_eos.html ogg_page_granulepos.html\
@@ -24,4 +24,3 @@ doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
 	oggpack_writecopy.html oggpack_writeinit.html oggpack_writetrunc.html\
 	overview.html reference.html style.css
 
-EXTRA_DIST = $(doc_DATA)