diff --git a/Makefile.am b/Makefile.am
index 9e1c407..40c87c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
+AUTOMAKE_OPTIONS = 1.9 foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src win32 conf
+SUBDIRS =	conf doc src win32
+
+dist_doc_DATA = COPYING README
+
+CLEANFILES =	core *.core *~ .*~
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"