diff --git a/Makefile.am b/Makefile.am
index 61a7ad1aa84..add10891918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,16 +23,15 @@ SUBDIRS = src
 
 ACLOCAL_AMFLAGS = -I m4
 
-doxygen:
-	cd doxygen && $(MAKE)
-
-.PHONY: doxygen
-
 # Rules for making release tarballs
 
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
+EXTRA_DIST = \
+	docs \
+	doxygen
+
 EXTRA_FILES = \
 	aclocal.m4					\
 	configure					\
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e8f26479b3..a4f26315abe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,4 +51,4 @@ if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
 
-EXTRA_DIST = getopt
+EXTRA_DIST = egl/docs getopt
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 81840b2081b..818545dedf2 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -112,6 +112,7 @@ SUBDIRS += winsys/sw/wrapper
 ##
 
 EXTRA_DIST = \
+	docs \
 	winsys/sw/android \
 	winsys/sw/gdi \
 	winsys/sw/hgl