diff --git a/ChangeLog b/ChangeLog
index 3cc4439d8..c4b6b5ada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
 2003-06-26  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
 
+	* doc/Makefile.am: Rewrite to run Doxygen whenever Doxyfile.in
+	or configure.ac changes.  Distribute the html doc.
+	* doc/Doxyfile.in (EXCLUDE_PATTERNS): Complete with
+	useless Bison classes.
+	(FILE_PATTERNS): Remove *.cc files.
+
 	Distribute BuDDy.  Compile and link with the included version if
-	explicitely requested (--with-included-buddy) or if there is
-	now stuitable version already installed.
-	
+	explicitely requested (--with-included-buddy) or if there is now
+	stuitable version already installed.
+
 	* buddy/: New directory.  Contains a patched version of BuDDy 2.2.
 	* m4/buddy.m4: Make sure the installed BuDDy supports bdd_mergepairs.
 	Honor --with-included-buddy and --without-included-buddy.  Define
@@ -14,7 +20,7 @@
 	* src/Makefile.am (libspot_LDFLAGS): New variable.
 	* src/tgba/Makefile.am (AM_CPPFLAGS): Add $(BUDDY_CPPFLAGS).
 	* src/tgbaalgos/Makefile.am (AM_CPPFLAGS): Likewise.
-	* src/tgbatest/Makefile.am (AM_CPPFLAGS): Likewise.	
+	* src/tgbatest/Makefile.am (AM_CPPFLAGS): Likewise.
 
 2003-06-25  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
 
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 145d4f250..5ce7de602 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -58,13 +58,16 @@ WARN_LOGFILE           =
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = @top_srcdir@/src
-FILE_PATTERNS          = *.cc \
-                         *.hh \
+FILE_PATTERNS          = *.hh \
                          *.hxx
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = *test/*
+EXCLUDE_PATTERNS       = */tgbaparse/location.hh \
+		         */tgbaparse/stack.hh \
+			 */tgbaparse/position.hh \
+		         */*parse/*parse*.hh \
+			 *test/*
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6da3251d2..9d8dc4190 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,20 @@
 DOXYGEN = doxygen
 
-.PHONY: doc html
+.PHONY: doc spot
 
-doc: spot
+all-local: stamp
 
-spot: Doxyfile
-	$(DOXYGEN)
+doc:
+	rm stamp
+	$(AMKE) stamp
 
-clean-local:
+stamp: Doxyfile.in ../configure.ac
+	$(MAKE) Doxyfile
 	rm -rf spot.html spot.latex
+	$(DOXYGEN)
+	: > $@
+
+spot.html: stamp
+spot.latex: stamp
+
+EXTRA_DIST = stamp spot.html