diff --git a/ChangeLog b/ChangeLog
index 142f349..d987d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,134 @@
+2015-03-03 13:17  marc
+
+	* configure.ac, makefile.am, src/mrw/args.hxx, src/version.cxx.in:
+	  correct macro name and make what/ident optional
+
+2015-02-19 08:06  marc
+
+	* debian/control.in: changed too many VERSION to PACKAGE_VERSION,
+	  partially undo; refs #12
+
+2015-02-19 07:56  marc
+
+	* configure.ac, doc/doxyfile.in, src/makefile.am,
+	  src/mrw/checkcxx11.hxx, src/mrw/makefile.am: changed too many
+	  VERSION to PACKAGE_VERSION, partially undo; refs #12
+
+2015-02-18 13:49  marc
+
+	* debian/changelog.in, debian/rules: fixed some more debian build
+	  issues - changed like in webtester; refs #12
+
+2015-02-18 12:58  marc
+
+	* ChangeLog, debian/changelog.in: fixed some more debian build
+	  issues - changed like in webtester; refs #12
+
+2015-02-18 10:35  marc
+
+	* ChangeLog, configure.ac, debian/control.in, debian/rules: fixed
+	  some more debian build issues - changed like in webtester; refs
+	  #12
+
+2015-02-18 08:52  marc
+
+	* debian/control.in: fixed some more debian build issues - changed
+	  like in webtester; refs #12
+
+2015-02-17 13:51  marc
+
+	* debian/control.in: fixed some more debian build issues - changed
+	  like in webtester; refs #12
+
+2015-02-17 12:57  marc
+
+	* debian/control.in: fixed some more debian build issues - changed
+	  like in webtester; refs #12
+
+2015-02-17 12:44  marc
+
+	* AUTHORS, ChangeLog, configure.ac, configure.in,
+	  debian.changelog.in, debian.control.in, debian/changelog.in,
+	  doc/doxyfile.in, doc/makefile.am, makefile.am,
+	  mrw-c++-minimal.spec.in, mrw-c++.spec.in, src/makefile.am,
+	  src/mrw-c++.pc.in, src/mrw/args.hxx, src/mrw/checkcxx11.hxx,
+	  src/mrw/makefile.am, src/mrw/mrw.hxx.in, src/version.cxx.in:
+	  fixed some more debian build issues - changed like in webtester;
+	  refs #12
+
+2015-02-17 08:07  marc
+
+	* configure.in, debian/control.in: fixed some debian build issues;
+	  refs #12
+
+2014-12-12 14:43  marc
+
+	* debian/control.in: binutils-dev contains demangle.h in wheezy,
+	  not libiberty-dev; refs #12
+
+2014-12-12 14:33  marc
+
+	* src/mrw/checkcxx11.hxx: one endif too much; refs #12
+
+2014-12-12 12:49  marc
+
+	* configure.in, src/mrw/checkcxx11.hxx: fix debian build failure;
+	  refs #12
+
+2014-11-06 10:24  marc
+
+	* configure.in, debian/changelog.in, debian/control.in,
+	  makefile.am, src/mrw/checkcxx11.hxx: fix debian packaging and fix
+	  build on new mac; refs #11
+
+2014-09-16 08:32  marc
+
+	* src/mrw/checkcxx11.hxx: corrected C++11-detection; refs #11
+
+2014-09-12 14:45  marc
+
+	* src/mrw/checkcxx11.hxx: next try, #elif not #elsif; refs #11
+
+2014-09-12 14:43  marc
+
+	* src/mrw/checkcxx11.hxx: next try, doku; refs #11
+
+2014-09-12 14:40  marc
+
+	* src/mrw/checkcxx11.hxx: next try, doku; refs #11
+
+2014-09-12 14:30  marc
+
+	* src/mrw/checkcxx11.hxx: next try, doku; refs #11
+
+2014-09-12 14:27  marc
+
+	* src/mrw/checkcxx11.hxx: next try, doku; refs #11
+
+2014-09-12 14:23  marc
+
+	* src/mrw/checkcxx11.hxx: next try, doku; refs #11
+
+2014-09-12 14:19  marc
+
+	* src/mrw/checkcxx11.hxx: next try, seems to be in a different
+	  namespace; refs #11
+
+2014-09-12 14:11  marc
+
+	* src/mrw/checkcxx11.hxx: next try as seen in
+	  http://stackoverflow.com/questions/13445742/apple-and-shared-ptr;
+	  refs #11
+
+2014-09-12 13:50  marc
+
+	* src/mrw/checkcxx11.hxx: include memory to get shared_ptr if it is
+	  not emulated; refs #11
+
+2014-09-12 11:11  marc
+
+	* src/mrw/checkcxx11.hxx: undo [346]; refs #11
+
 2014-09-12 11:07  marc
 
 	* src/mrw/checkcxx11.hxx: boost fails on mac gcc 4.2; refs #11
diff --git a/configure.ac b/configure.ac
index 03539bc..316114c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ DOC_DIR=doc
 AC_CONFIG_FILES([makefile ${PACKAGE_NAME}.spec src/version.cxx
                  src/makefile test/makefile
                  doc/doxyfile doc/makefile
-                 src/mrw/mrw.hxx doc/examples/makefile
+                 src/mrw/mrw.hxx examples/makefile
                  src/${PACKAGE_NAME}.pc debian/changelog debian/control])
 
 # libtool versioning
diff --git a/doc/doxyfile.in b/doc/doxyfile.in
index 6765ac5..8cceee3 100644
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@@ -723,7 +723,7 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = @top_srcdir@
+EXAMPLE_PATH           = @top_srcdir@/examples
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/doc/makefile.am b/doc/makefile.am
index 16d7aa2..4ff26f8 100644
--- a/doc/makefile.am
+++ b/doc/makefile.am
@@ -5,9 +5,7 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = examples
-
-ALL_SRC = $(shell find ${top_srcdir}/doc/examples ${top_srcdir}/src \
+ALL_SRC = $(shell find ${top_srcdir}/examples ${top_srcdir}/src \
                   -name '*.[ch]xx')
 # ${top_srcdir}/src/*.doc
 
@@ -47,4 +45,4 @@ install-data-hook:
 
 uninstall-hook:
 	-chmod -R u+w $(DESTDIR)${docdir}
-	-rm -rf $(DESTDIR)${docdir}/*
+	-rm -rf $(DESTDIR)${docdir}/html
diff --git a/doc/examples/arguments.cxx b/examples/arguments.cxx
similarity index 100%
rename from doc/examples/arguments.cxx
rename to examples/arguments.cxx
diff --git a/doc/examples/exceptionhandling.cxx b/examples/exceptionhandling.cxx
similarity index 100%
rename from doc/examples/exceptionhandling.cxx
rename to examples/exceptionhandling.cxx
diff --git a/doc/examples/makefile.am b/examples/makefile.am
similarity index 100%
rename from doc/examples/makefile.am
rename to examples/makefile.am
diff --git a/doc/examples/shared.cxx b/examples/shared.cxx
similarity index 100%
rename from doc/examples/shared.cxx
rename to examples/shared.cxx
diff --git a/doc/examples/smartpointer.cxx b/examples/smartpointer.cxx
similarity index 100%
rename from doc/examples/smartpointer.cxx
rename to examples/smartpointer.cxx
diff --git a/makefile.am b/makefile.am
index eb517aa..7d02401 100644
--- a/makefile.am
+++ b/makefile.am
@@ -11,9 +11,7 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@
-
-doc_DATA = AUTHORS COPYING ChangeLog NEWS README INSTALL
+SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@ examples
 
 EXTRA_DIST = bootstrap.sh debian build-string
 
diff --git a/test/makefile.am b/test/makefile.am
index 875667b..14dea07 100644
--- a/test/makefile.am
+++ b/test/makefile.am
@@ -33,7 +33,9 @@ if AUTOFNTRACE
       NO_VALGRIND_CHECKS += mrwautofunctiontracelog4cxx_test
 if HAVE_THREADS
 if HAVE_BOOST_THREAD
-        NO_VALGRIND_CHECKS += mrwautofunctiontracelog4cxx_test-mt
+# @bug Actually, the following test fails; to be repaired, see
+# 
+#        NO_VALGRIND_CHECKS += mrwautofunctiontracelog4cxx_test-mt
 endif
 endif
 endif