diff --git a/ChangeLog b/ChangeLog.pre-git
similarity index 100%
rename from ChangeLog
rename to ChangeLog.pre-git
diff --git a/autogen.sh b/autogen.sh
index aa638a6b..8b977268 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ PKG_NAME="libsoup"
 REQUIRED_AUTOMAKE_VERSION=1.6
 
 (test -f $srcdir/configure.in \
-  && test -f $srcdir/ChangeLog \
+  && test -f $srcdir/libsoup.doap \
   && test -d $srcdir/libsoup) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
diff --git a/configure.in b/configure.in
index 8f506c33..529c9a63 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl *******************************************
 AC_PREREQ(2.53)
 AC_INIT(libsoup, 2.26.1)
 AC_CONFIG_SRCDIR(libsoup-2.4.pc.in)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([foreign])
 
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE