diff --git a/Makefile.am b/Makefile.am
index a265718..f6ddef6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,4 @@ AUTOMAKE_OPTIONS = gnu
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = m4/gnulib-cache.m4
-SUBDIRS = lib src man tests contrib
-
-if ENABLE_DOXYGEN
-SUBDIRS += doc
-endif
+SUBDIRS = doc lib src man tests contrib
diff --git a/configure.ac b/configure.ac
index ad241f2..1623ba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ AS_IF([test x$enable_doxygen = xyes], [
 	AC_CHECK_PROGS([DOXYGEN], [doxygen])
 	AS_IF([test "x$DOXYGEN" = "x"],
 		AC_MSG_ERROR([doxygen not in path]),
-		AC_CONFIG_FILES([doc/Makefile doc/doxy.conf])
+		AC_CONFIG_FILES([doc/doxy.conf])
 	)
 
 	AC_CHECK_PROGS([DOXYGEN_DOT], [dot])
@@ -146,6 +146,7 @@ AC_CONFIG_FILES([
 	man/Makefile
 	man/dhcpd-pools.1
 	tests/Makefile
+	doc/Makefile
 	contrib/Makefile
 ])