diff --git a/Makefile.am b/Makefile.am
index ffef64031def2a14196dadda14d912f9e24d3fbf..00163d9a8dcb8d785a4cc2a2387de7d2dacc81e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,11 @@ $(DEMO): DEMO
 	( cd ../DEMO ; $(TAR) cf - . ) | $(TAR) xf -
 
 clean-local:
-	-rm -rf $(DEMO)
 	-rm -f  $(DEMO).tar.gz
 
+distclean-local:
+	-rm -rf $(DEMO)
+
 if MAINTAINER_MODE
 # This target only makes sense for maintainers!!
 cvs-clean:
@@ -77,7 +79,7 @@ dist-hook:
 generate-alberta-dist:
 	./generate-alberta-automakefiles.sh
 	autoreconf
-	./configure --enable-alberta-12 --enable-alberta-13 --enable-alberta-23 --enable-el-index --enable-maintainer-mode --prefix=@prefix@
+	./configure --enable-maintainer-mode --prefix=@prefix@
 	make dist
 endif