diff --git a/Makefile b/Makefile
index a580a20..3a1e769 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/tests/binary/Makefile.Windows \
 		$(PACKAGE)-$(VERSION)/tests/command/project.conf \
 		$(PACKAGE)-$(VERSION)/tests/command/Makefile.NetBSD \
+		$(PACKAGE)-$(VERSION)/tests/config.sh \
 		$(PACKAGE)-$(VERSION)/tests/include/project.conf \
 		$(PACKAGE)-$(VERSION)/tests/include/Makefile.NetBSD \
 		$(PACKAGE)-$(VERSION)/tests/java/project.conf \
@@ -139,6 +140,14 @@ dist:
 		$(PACKAGE)-$(VERSION)/tests/verilog/project.conf \
 		$(PACKAGE)-$(VERSION)/tests/verilog/Makefile.NetBSD \
 		$(PACKAGE)-$(VERSION)/tests/project.conf \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/Makefile \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/xml/gtkdocentities.ent \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/project.conf \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/Makefile \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/example.types \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/example-docs.xml \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/example-sections.txt \
+		$(PACKAGE)-$(VERSION)/tests/gtkdoc/gtkdoc/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/AUTHORS \
 		$(PACKAGE)-$(VERSION)/BUGS \
diff --git a/tests/Makefile b/tests/Makefile
index 0934152..a30ea8e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,3 +1,4 @@
+SUBDIRS	= gtkdoc
 TARGETS	= $(OBJDIR)clint.log $(OBJDIR)coverage.log $(OBJDIR)fixme.log $(OBJDIR)htmllint.log $(OBJDIR)phplint.log $(OBJDIR)pylint.log $(OBJDIR)shlint.log $(OBJDIR)template-test.md $(OBJDIR)tests.log $(OBJDIR)xmllint.log
 OBJDIR	=
 PREFIX	= /usr/local
@@ -8,7 +9,14 @@ MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 
 
-all: $(OBJDIR)clint.log $(OBJDIR)htmllint.log $(OBJDIR)phplint.log $(OBJDIR)pylint.log $(OBJDIR)shlint.log $(OBJDIR)template-test.md $(OBJDIR)tests.log $(OBJDIR)xmllint.log
+all: subdirs $(OBJDIR)clint.log $(OBJDIR)htmllint.log $(OBJDIR)phplint.log $(OBJDIR)pylint.log $(OBJDIR)shlint.log $(OBJDIR)template-test.md $(OBJDIR)tests.log $(OBJDIR)xmllint.log
+
+subdirs:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/"; \
+		else $(MAKE); fi) || exit; done
 
 $(OBJDIR)clint.log: ../doc/scripts/clint.sh
 	../doc/scripts/clint.sh -P "$(PREFIX)" -- "$(OBJDIR)clint.log"
@@ -41,6 +49,10 @@ $(OBJDIR)xmllint.log: ../doc/scripts/xmllint.sh
 	../doc/scripts/xmllint.sh -P "$(PREFIX)" -- "$(OBJDIR)xmllint.log"
 
 clean:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
+		else $(MAKE) clean; fi) || exit; done
 	../doc/scripts/clint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)clint.log"
 	../doc/scripts/coverage.sh -c -P "$(PREFIX)" -- "$(OBJDIR)coverage.log"
 	../doc/scripts/fixme.sh -c -P "$(PREFIX)" -- "$(OBJDIR)fixme.log"
@@ -52,11 +64,33 @@ clean:
 	./tests.sh -c -P "$(PREFIX)" -- "$(OBJDIR)tests.log"
 	../doc/scripts/xmllint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)xmllint.log"
 
-distclean: clean
+distclean:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
+		else $(MAKE) distclean; fi) || exit; done
+	../doc/scripts/clint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)clint.log"
+	../doc/scripts/coverage.sh -c -P "$(PREFIX)" -- "$(OBJDIR)coverage.log"
+	../doc/scripts/fixme.sh -c -P "$(PREFIX)" -- "$(OBJDIR)fixme.log"
+	../doc/scripts/htmllint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)htmllint.log"
+	../doc/scripts/phplint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)phplint.log"
+	../doc/scripts/pylint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pylint.log"
+	../doc/scripts/shlint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)shlint.log"
+	../doc/scripts/template.sh -c -P "$(PREFIX)" -O DATABASEDIR=. -- "$(OBJDIR)template-test.md"
+	./tests.sh -c -P "$(PREFIX)" -- "$(OBJDIR)tests.log"
+	../doc/scripts/xmllint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)xmllint.log"
 	$(RM) -- $(TARGETS)
 
 install: all
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
+		else $(MAKE) install; fi) || exit; done
 
 uninstall:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
+		else $(MAKE) uninstall; fi) || exit; done
 
-.PHONY: all clean distclean install uninstall
+.PHONY: all subdirs clean distclean install uninstall
diff --git a/tests/gtkdoc/Makefile b/tests/gtkdoc/Makefile
new file mode 100644
index 0000000..435e052
--- /dev/null
+++ b/tests/gtkdoc/Makefile
@@ -0,0 +1,63 @@
+SUBDIRS	= gtkdoc
+TARGETS	= $(OBJDIR)gtkdoc/html.stamp $(OBJDIR)gtkdoc/tmpl.stamp $(OBJDIR)gtkdoc/xml.stamp
+OBJDIR	=
+PREFIX	= /usr/local
+DESTDIR	=
+RM	= rm -f
+LN	= ln -f
+MKDIR	= mkdir -m 0755 -p
+INSTALL	= install
+
+
+all: subdirs $(TARGETS)
+
+subdirs:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/"; \
+		else $(MAKE); fi) || exit; done
+
+$(OBJDIR)gtkdoc/html.stamp: ../../doc/scripts/gtkdoc.sh ../config.sh gtkdoc/example-docs.xml gtkdoc/xml/gtkdocentities.ent $(OBJDIR)gtkdoc/xml.stamp $(OBJDIR)gtkdoc/tmpl.stamp
+	../../doc/scripts/gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp"
+
+$(OBJDIR)gtkdoc/tmpl.stamp: ../../doc/scripts/gtkdoc.sh ../config.sh gtkdoc/example.types
+	../../doc/scripts/gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/tmpl.stamp"
+
+$(OBJDIR)gtkdoc/xml.stamp: ../../doc/scripts/gtkdoc.sh ../config.sh $(OBJDIR)gtkdoc/tmpl.stamp
+	../../doc/scripts/gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/xml.stamp"
+
+clean:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
+		else $(MAKE) clean; fi) || exit; done
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp"
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/tmpl.stamp"
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/xml.stamp"
+
+distclean:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
+		else $(MAKE) distclean; fi) || exit; done
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp"
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/tmpl.stamp"
+	../../doc/scripts/gtkdoc.sh -c -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/xml.stamp"
+	$(RM) -- $(TARGETS)
+
+install: all
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
+		else $(MAKE) install; fi) || exit; done
+	../../doc/scripts/gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp"
+
+uninstall:
+	@for i in $(SUBDIRS); do (cd "$$i" && \
+		if [ -n "$(OBJDIR)" ]; then \
+		$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
+		else $(MAKE) uninstall; fi) || exit; done
+	../../doc/scripts/gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gtkdoc/html.stamp"
+
+.PHONY: all subdirs clean distclean install uninstall
diff --git a/tests/gtkdoc/gtkdoc/Makefile b/tests/gtkdoc/gtkdoc/Makefile
new file mode 100644
index 0000000..7ae6224
--- /dev/null
+++ b/tests/gtkdoc/gtkdoc/Makefile
@@ -0,0 +1,13 @@
+
+
+all:
+
+clean:
+
+distclean: clean
+
+install: all
+
+uninstall:
+
+.PHONY: all clean distclean install uninstall