diff --git a/.gitignore b/.gitignore
index 5939c0323..f7cb506dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,5 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 
-docs/gtk-doc.make
 m4/gtk-doc.m4
+docs/gtk-doc.make
diff --git a/autogen.sh b/autogen.sh
index f4ff2019d..26f4160c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
-type -p gtkdocize > /dev/null && gtkdocize --docdir docs
+if type -p gtkdocize > /dev/null; then
+	gtkdocize --docdir docs
+else
+	echo 'EXTRA_DIST =' > docs/gtk-doc.make
+	echo 'AC_DEFUN([GTK_DOC_CHECK], [AM_CONDITIONAL([ENABLE_GTK_DOC], [FALSE])])' > m4/gtk-doc.m4
+fi
 
 autoreconf -f -i
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index 848ad6a4a..3fba8ea47 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -92,13 +92,11 @@ GTKDOC_CFLAGS = \
 
 GTKDOC_LIBS = \
 	$(GLIB_LIBS) \
-	$(top_builddir)/libgudev-1.0.la
-
-if ENABLE_GTK_DOC
-EXTRA_DIST=
+	$(top_builddir)/src/gudev/libgudev-1.0.la \
+	$(top_builddir)/src/udev/libudev-core.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -110,6 +108,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index 7899bd114..c6d7b8ca2 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -88,11 +88,8 @@ override LDFLAGS=
 GTKDOC_CFLAGS=
 GTKDOC_LIBS=
 
-if ENABLE_GTK_DOC
-EXTRA_DIST=
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -104,6 +101,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif