diff --git a/ChangeLog b/ChangeLog
index facce78..8f3db47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2015-03-13 16:30  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  debian/compat, debian/copyright, debian/dirs,
+	  debian/libpcscxx.doc-base.EX, debian/shlibs.local.ex,
+	  debian/watch.ex: improved bootstrapping
+
+2015-03-12 09:16  marc
+
+	* ChangeLog, ax_init_standard_project.m4: bugfix new buildsystem:
+	  makefile.in is in top_srcdir
+
+2015-03-11 16:00  marc
+
+	* ax_check_qt.m4, ax_cxx_compile_stdcxx_11.m4,
+	  ax_init_standard_project.m4, bootstrap.sh, configure.ac,
+	  debian/changelog.in, doc/doxyfile.in, doc/examples,
+	  doc/makefile.am, examples, m4, makefile.am, src/makefile.am:
+	  completely new, megacool build system step 1
+
 2015-03-05 14:48  marc
 
 	* debian/control.in: uic is required if qt is used
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index a01617b..9707cea 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -104,7 +104,8 @@ AC_DEFUN([AX_USE_CXX], [
 
   AC_CONFIG_FILES([src/makefile])
   
-  AM_CPPFLAGS="-DPACKAGE_VERSION='\"${PACKAGE_VERSION}\"' -DPACKAGE_NAME='\"${PACKAGE_NAME}\"'"
+  AM_CPPFLAGS='-I ${top_srcdir}/src -I ${top_builddir}/src'
+  AM_LDFLAGS='-L ${top_srcdir}/src -I ${top_builddir}/src'
 
   # Get rid of that stupid -O2 -g opions!
   CXXFLAGS="${CXXFLAGS:-}"
@@ -138,6 +139,7 @@ AC_DEFUN([AX_USE_CXX], [
   
   AC_SUBST(AM_CXXFLAGS)
   AC_SUBST(AM_CPPFLAGS)
+  AC_SUBST(AM_LDFLAGS)
 ])
 
 AC_DEFUN([AX_USE_CPPUNIT], [
diff --git a/bootstrap.sh b/bootstrap.sh
index 14edcfe..9c62216 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -119,10 +119,12 @@ copy() {
 
 doxyreplace() {
     echo -n "-> doxyfile: configure $1 ..."
-    if sed -i 's§\(^'"$1"' *=\) *§\1'" $2"'§g' doc/doxyfile.in; then
+    if sed -i 's|\(^'"$1"' *=\) *|\1'" $2"'|g' doc/doxyfile.in; then
         echo " success"
     else
-        echo " ignored"
+        echo " error"
+        echo "**** command: sed -i 's|\(^'"$1"' *=\) *|\1'" $2"'|g' doc/doxyfile.in;"
+        exit 1
     fi
 }
 
@@ -163,10 +165,10 @@ echo "${HEADER}" | to --condition AX_USE_DOXYGEN doc/makefile.am
 echo "${HEADER}" | to --condition AX_BUILD_EXAMPLES examples/makefile.am
 if testtag AX_USE_DOXYGEN && ! test -f doc/doxyfile.in; then
     run doxygen -g doc/doxyfile.in
-    doxyreplace PROJECT_NAME '"@PACKAGE_NAME@"'
-    doxyreplace PROJECT_NUMBER '"@PACKAGE_VERSION@"'
-    doxyreplace PROJECT_BRIEF '"@DESCRIPTION@"'
-    doxyreplace PROJECT_LOGO '"@PROJECT_LOGO@"'
+    doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
+    doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
+    doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
+    doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
     doxyreplace INLINE_INHERITED_MEMB YES
     doxyreplace MULTILINE_CPP_IS_BRIEF YES
     doxyreplace TAB_SIZE 2
@@ -267,7 +269,7 @@ usr/include
 EOF
     fi
     to debian/rules <<EOF
-%:
+${HEADER}%:
 	dh $@
 EOF
     echo 7 | to debian/compat
@@ -288,8 +290,8 @@ includedir=${prefix}/include
 Name: @PACKAGE_NAME@
 Description: @DESCRIPTION@
 Version: @VERSION@
-Libs: -L${libdir} -l@PACKAGE_NAME@
-Cflags: -I${includedir} 
+Libs: -L${libdir} -l@PACKAGE_NAME@ @LDFLAGS@
+Cflags: -I${includedir} @CPPFLAGS@
 EOF
 
 #### Cleanup If Makefile Exists ####
diff --git a/src/libpcscxx.pc.in b/src/libpcscxx.pc.in
index 36ca744..9e2a68a 100644
--- a/src/libpcscxx.pc.in
+++ b/src/libpcscxx.pc.in
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: @PACKAGE_NAME@
 Description: C++ wrappers around pcsc-lite, cryptoki, openssh
 Version: @VERSION@
-Libs: -L${libdir} -lpcscxx
+Libs: -L${libdir} -lpcscxx @LDFLAGS@
 Libs.private: 
-Cflags: -I${includedir} 
+Cflags: -I${includedir} @CPPFLAGS@