diff --git a/Makefile.am b/Makefile.am
index 8dce9900f26986606f5d557426312f4e19b8fb67..6b1a58ed5e4993b5a3edcc24b0ca0bb3edc8c76e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,7 @@
-SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
-EXTRA_DIST = DEMO
\ No newline at end of file
+SUBDIRS = BLAS IAMTOOLS SOLVER PLOT_ANSI ALBERT
+
+EXTRA_DIST = DEMO
+
+dist-hook:
+	cd $(distdir)/DEMO
+	rm -rf CVS src/CVS src/1d/CVS src/2d/CVS src/3d/CVS src/Common/CVS
\ No newline at end of file
diff --git a/configure.in b/configure.in
index ad04e1e187217922a8e26976810f3afc213e08a2..b641276b26e3b0140dfd55d91413fb86e11d0ce8 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PROG_F77
 dnl support for Libtool
 AM_PROG_LIBTOOL
 
-dnl change the installation directory
+dnl change the installation directory. This could surely be done more elegantly...
 AC_PREFIX_DEFAULT(`pwd`)
 
 dnl look for X11 library paths AND sets all necessary flags (X_CFLAGS) e.g.
@@ -107,7 +107,7 @@ if test -f ./gltools-2-3/libgltools.a; then
   AC_DEFINE(HAVE_LIBGLTOOLS)
   gltools_include="-I`pwd`/gltools-2-3"
   albert_variable_source=gltools.c
-  LIBS="-L$withval/gltools-2-3 -lgltools $LIBS"
+  LIBS="-L`pwd`/gltools-2-3 -lgltools $LIBS"
 else
   AC_MSG_RESULT([No libgltools.a found in ./gltools-2-3])
 fi)
@@ -119,4 +119,4 @@ AC_SUBST(gltools_include)
 AC_SUBST(albert_variable_source)
 AC_SUBST(make_own_blas_lib)
 
-AC_OUTPUT(Makefile BLAS/Makefile ALBERT_UTIL/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile ALBERT/Makefile ALBERT/src/Makefile ALBERT/src/1d/Makefile ALBERT/src/2d/Makefile ALBERT/src/3d/Makefile ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert DEMO/1d/Makefile DEMO/2d/Makefile DEMO/3d/Makefile)
+AC_OUTPUT(Makefile BLAS/Makefile IAMTOOLS/Makefile SOLVER/Makefile SOLVER/src/Makefile PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile ALBERT/Makefile ALBERT/src/Makefile ALBERT/src/1d/Makefile ALBERT/src/2d/Makefile ALBERT/src/3d/Makefile ALBERT/src/Common/Makefile ALBERT/src/Common/Makefile.albert DEMO/src/1d/Makefile DEMO/src/2d/Makefile DEMO/src/3d/Makefile)