diff --git a/.cvsignore b/.cvsignore
index 0d73616e2040d62d4dc0c1799322b94936756e33..19e18455c2a4bde6fa096094d563a9228c8aeb5b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,7 @@
 Makefile
 Makefile.in
 aclocal.m4
-albert-1.2.tar.gz
+albert-*.tar.gz
 autom4te.cache
 bin
 config.cache
diff --git a/Makefile.am b/Makefile.am
index 485bf3c96fc2e0ca23d773f3d5e51e04b7c36639..450f91937370cc36ee9592647a7a569b0a3438af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,14 @@
 if GRAPE
- SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE
+ SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE
 else 
- SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
+ SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
 endif
 
 ACLOCAL_AMFLAGS  = -I ./m4
 
 EXTRA_DIST = DEMO $(wildcard m4/*.m4)
 
+if MAINTAINER_MODE
 # This target only makes sense for maintainers!!
 cvs-clean:
 	@echo Fixing package for cvs commit...
@@ -29,10 +30,22 @@ cvs-clean:
 	cp -f INSTALL admin/
 	chgrp -R albert *
 
-dist-hook:
+#
+# this one requires write access to the source directory. One day one might
+# want to automakify ALBERT/doc/ ...
+#
+documentation:
+	make -C $(top_srcdir)/ALBERT/doc/ albert.ps
+
+dist-hook: documentation
 	@echo Deleting CVS directories in $(distdir)
 	rm -rf `find $(distdir) -name CVS`
+	@echo Deleting .cvsignore file in $(distdir)
+	rm -f `find $(distdir) -name '.cvsignore'`
 	@echo Cleaning up DEMO directory in $(distdir)
 	find $(distdir)/DEMO \( -name \*~ -o -name \*.o -o -name \*.lo \) -exec /bin/rm -f {} \;
 	find $(distdir)/DEMO \( -name ellipt -o -name heat -o -name nonlin \) -exec /bin/rm -f {} \;
-	find $(distdir)/DEMO -name Makefile -exec /bin/rm -f {} \;
\ No newline at end of file
+	find $(distdir)/DEMO -name Makefile -exec /bin/rm -f {} \;
+
+endif
+
diff --git a/configure.ac b/configure.ac
index ded6443e38f84f1e99c122eaf0cdf6766d27fa5d..30b32f328d4d419ae476ce2b1bc1288a09b2ee30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.52)
-AC_INIT([albert], [1.2], [dani@mathematik.uni-freiburg.de])
+AC_INIT([albert], [1.2-pre1], [dani@mathematik.uni-freiburg.de])
 
 AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h])
+AM_MAINTAINER_MODE
 
 AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile
 		 gnu-compat/Makefile