diff --git a/Makefile.am b/Makefile.am
index eb32cc2..f76ba02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,13 @@
-AUTOMAKE_OPTIONS = foreign nostdinc
-
 SUBDIRS = src example tests docs
 
-include_HEADERS = include/libssh2.h include/libssh2_publickey.h	\
- include/libssh2_sftp.h
+include_HEADERS =			\
+	include/libssh2.h		\
+	include/libssh2_publickey.h	\
+	include/libssh2_sftp.h
 
-EXTRA_DIST = LICENSE win32
+EXTRA_DIST = win32
 
 ACLOCAL_AMFLAGS = -I m4
+
+ChangeLog:
+	cvs2cl --utc --fsf --FSF --usermap .cvsusers -I ChangeLog -I .cvs