diff --git a/Makefile.in b/Makefile.in
index 9dcc9eb9..b6c9558a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,8 +20,12 @@ default:
 
 all : default 
 
+doc: 
+	cd doc && $(MAKE) $@
+
 clean:
 	cd src && $(MAKE) $@
+	cd doc && $(MAKE) $@
 	rm -f *.o
 
 distclean:
@@ -78,4 +82,4 @@ Makefile: Makefile.in config.status
 configure.status: configure
 	./config.status --recheck
 
-.PHONY: all distclean clean default
+.PHONY: all distclean clean default doc
diff --git a/doc/Makefile.in b/doc/Makefile.in
new file mode 100644
index 00000000..1e705add
--- /dev/null
+++ b/doc/Makefile.in
@@ -0,0 +1,39 @@
+#
+# @configure_input@
+#
+
+package = @PACKAGE_NAME@
+version = @PACKAGE_VERSION@
+tarname = @PACKAGE_TARNAME@
+distdir = $(tarname)-$(version)
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+DOCDIRS = html latex man
+
+default: all
+
+all: doc
+
+doc: 
+	cd ../src && doxygen
+
+clean:
+	rm -rf $(DOCDIRS)
+
+distclean : clean
+	rm -f Makefile config.status config.log
+	rm -Rf autom4te.cache
+
+Makefile: Makefile.in ../config.status
+	cd .. && ./config.status $@
+
+configure.status: configure
+	cd .. && ./config.status --recheck
+
+.PHONY: clean $(DOC)
diff --git a/src/Makefile.in b/src/Makefile.in
index 0ce10e7a..c1fe9445 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -42,7 +42,7 @@ clean:
 distclean : clean
 	cd test && $(MAKE) $@
 	cd example && $(MAKE) $@
-	rm -f Makefile config.status config.log
+	rm -f Makefile config.status config.log Doxyfile
 	rm -Rf autom4te.cache
 
 $(distdir): FORCE