diff --git a/Makefile.am b/Makefile.am
index 21a7c7d72ce49b39ca7b9c9aee7aa99b36770941..fa3a0a5d370eac1d2af95c1a1612ff4bb2f2a782 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # standard automake rules
 
 SUBDIRS = man lib scripts daemons docs testing tools
-EXTRA_DIST = ganeti.initd
+EXTRA_DIST = docs/examples/ganeti.initd
 
 # custom rules
 depgraph: depgraph.png
diff --git a/autogen.sh b/autogen.sh
index cdb14ff0739f1c5bb57c2e33e4c050e5e5f163d0..a1f2bf56b630582c31aa0bdf082c5d4819336c37 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ fi
 set -e
 
 rm -rf config.cache autom4te.cache
-mkdir -p config
+mkdir -p autotools
 
 aclocal-1.9
 autoconf
diff --git a/configure.ac b/configure.ac
index 66fe35e96f5cfea8ecc248cd7928c0d6b52ed514..6cfcf5d7d2c25ee3f5d1dc2e4914c5fdfebe769d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 AC_INIT(ganeti, 1.2a, ganeti@googlegroups.com)
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR(autotools)
 AM_INIT_AUTOMAKE(foreign)
 
 # Checks for programs.