diff --git a/ChangeLog b/ChangeLog
index 296bf2c1e9bacd61660c8464df7af3e70f99e9ad..eedbdfa174ff5b5067837b3f8739ea0a05c34141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2003-07-08  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/AlbertMovie/m4/check-package.m4, /net/sauron/graid/ALBERT_CVS/SOLVER/src/banach.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/bicgstab.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/newton.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/newton_br.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/newton_ds.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/newton_fs.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/odir.c, /net/sauron/graid/ALBERT_CVS/SOLVER/src/ores.c, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/.cvsignore, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/COPYING, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/Makefile.am, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/README, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt.c, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt.h, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt1.c, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/malloc.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/sor.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/ssor.c, /net/sauron/graid/ALBERT_CVS/ALBERT_UTIL/albert_util.h, /net/sauron/graid/ALBERT_CVS/ALBERT_UTIL/divers.c, /net/sauron/graid/ALBERT_CVS/ALBERT_UTIL/parameters.c, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/2d/Makefile.am, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/3d/Makefile.am, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/albert_grape.c, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/albert_movi.c, /net/sauron/graid/ALBERT_CVS/PLOT_ANSI/src/PLOT2d.c, /net/sauron/graid/ALBERT_CVS/PLOT_ANSI/src/PLOT_open.c, /net/sauron/graid/ALBERT_CVS/PLOT_ANSI/src/PLOTlog.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/MG.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/MG_s.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/MG_s1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/MG_s2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/albert.h, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/estimator.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/macro_common.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/memory.c, /net/sauron/graid/ALBERT_CVS/ALBERT/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/.cvsignore, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/Makefile, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/macro.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/graphXO.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/macro.c, /net/sauron/graid/ALBERT_CVS/admin/rcs2log, /net/sauron/graid/ALBERT_CVS/admin/Makefile.am, /net/sauron/graid/ALBERT_CVS/admin/NEWS, /net/sauron/graid/ALBERT_CVS/admin/config.guess, /net/sauron/graid/ALBERT_CVS/admin/config.sub, /net/sauron/graid/ALBERT_CVS/admin/configure.ac, /net/sauron/graid/ALBERT_CVS/admin/ltmain.sh, /net/sauron/graid/ALBERT_CVS/admin/.cvsignore, /net/sauron/graid/ALBERT_CVS/admin/ChangeLog:
+	Merge from main trunk up to ALBERT_1_2_PRE_1.
+
+	* Tag with ALBERT_1_2_PRE_1
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Don't use -L$x_libraries 'cause $x_libraries can be empty, -L without
+	argument confuses the linker or resets the search path for libraries.
+	Instead, use AC_PATH_XTRA and $X_LIBS.
+
+2003-07-07  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/admin/ChangeLog:
+	Update. State of ALBERT_1_2_PRE_1 tag.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Use a really dirty hack to make libtool work with icc. libtool is _really_
+	brain-damaged w.r.t. to fortran.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/Makefile.am, /net/sauron/graid/ALBERT_CVS/admin/Makefile.am:
+	Target for albert.ps moved to where it belongs: ALBERT/Makefile.am.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/config.sub, /net/sauron/graid/ALBERT_CVS/admin/ltmain.sh, /net/sauron/graid/ALBERT_CVS/admin/config.guess:
+	Update to libtool-1.5.
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/3d/Makefile.am:
+	Use libalbertgnucompat.la, not .a
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Add ALBERT_UTIL to include-directories for GRAPE-stuff.
+
+	* /net/sauron/graid/ALBERT_CVS/AlbertMovie/m4/check-package.m4:
+	-LPATH should precede -lLIB.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/doc/.cvsignore, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/Makefile, /net/sauron/graid/ALBERT_CVS/admin/.cvsignore, /net/sauron/graid/ALBERT_CVS/admin/Makefile.am, /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Use AM_MAINTAINER_MODE, automatically create documentation with "make
+	dist".
+
+	* /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/.cvsignore, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/COPYING, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/Makefile.am, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/README, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt.c, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt.h, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/getopt1.c, /net/sauron/graid/ALBERT_CVS/admin/gnu-compat/malloc.c:
+	Initial revision.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Provide getopt_long() in gnu-compat/ in case it should be missing.
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/3d/Makefile.am, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/2d/Makefile.am:
+	Link with $(top_builddir)/gnu-compat/libalbertgnucompat.la in case
+	standard library functions are missing (i.e. getopt_long()).
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/albert_grape.c:
+	Use argv[0] not "argv[0]" :)
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/albert_grape.c, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/albert_movi.c:
+	Update the help-text to account for changed option handling
+	(i.e. mention the long-options). FIXME. Proof-read for typos.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/macro.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/macro_common.c:
+	Use ALBERT_DEFUNUSED() 'cause it's the actual function definition.
+
 2003-07-07  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
 
 	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac: