diff --git a/configure.ac b/configure.ac
index d32b70a0..baa154ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
 
 dnl Setup for automake
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
diff --git a/ChangeLog b/docs/upstream/ChangeLog
similarity index 100%
rename from ChangeLog
rename to docs/upstream/ChangeLog
diff --git a/NEWS b/docs/upstream/NEWS
similarity index 100%
rename from NEWS
rename to docs/upstream/NEWS
diff --git a/VERSION b/docs/upstream/VERSION
similarity index 100%
rename from VERSION
rename to docs/upstream/VERSION