diff --git a/Makefile.am b/Makefile.am
index e08948c2..d4638cc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,9 @@
-SUBDIRS = src/lib/utils src/lib/ebus src/lib/ebus/test src/ebusd src/ebusctl docs
+SUBDIRS = docs \
+	  src/lib/utils \
+	  src/lib/ebus \
+	  src/lib/ebus/test \
+	  src/ebusd \
+	  src/ebusctl
 
 distclean-local:
 	-rm -rf autom4te.cache
diff --git a/configure.ac b/configure.ac
index fb978ee7..e49a1449 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,12 +24,12 @@ AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_SRCDIR([src/ebusd/ebusd.cpp])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile
+		 docs/Makefile
 		 src/lib/utils/Makefile
 		 src/lib/ebus/Makefile
 		 src/lib/ebus/test/Makefile
 		 src/ebusd/Makefile
-		 src/ebusctl/Makefile
-		 docs/Makefile])
+		 src/ebusctl/Makefile])
 
 AC_CHECK_PROGS([HAVE_DOXYGEN], [doxygen])
 if test -z "$HAVE_DOXYGEN";