diff --git a/ChangeLog b/ChangeLog
index 26fd49f..966f3a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-17 11:05  
+
+	* [r13] COPYING, ChangeLog, INSTALL:
+	  backup
+
 2017-02-06 22:56  
 
 	* [r12] ChangeLog, configure.ac, resolve-debbuilddeps.sh:
diff --git a/ax_check_qt.m4 b/ax_check_qt.m4
index af3a238..e0eecf2 100644
--- a/ax_check_qt.m4
+++ b/ax_check_qt.m4
@@ -51,18 +51,33 @@
 
 AC_DEFUN([AX_CXX_QT_TOOL], [
   PKG_PROG_PKG_CONFIG
-  if test -z "$HAVE_$1"; then
+  if test -z "${HAVE_$1}"; then
     HAVE_$1=1
     AC_MSG_CHECKING([for $2])
     AC_ARG_VAR([$1], [path to Qt tool $2])
-    $1=${$1:-$(${PKG_CONFIG} --variable=$2_location Qt5Core)}
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2-qt5}
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins Qt5Core)/$2}
-    $1=${$1:-$(${PKG_CONFIG} --variable=$2_location QtCore)}
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2}
-    $1=${$1:-$(${PKG_CONFIG} --variable=host_bins QtCore)/$2-qt4}
-    if ! which "${$1%% *}" > /dev/null; then
-      if which "$2-qt5" > /dev/null; then
+    for package in Qt5Core QtCore; do
+        if test -x "${$1}"; then
+            break
+        fi
+        tool=$(${PKG_CONFIG} --variable=$2_location $package 2> /dev/null)
+        if test -x "${tool}"; then
+            $1="${tool}"
+            break
+        fi
+        tool=$(${PKG_CONFIG} --variable=host_bins $package 2> /dev/null)
+        if test -n "$tool"; then
+            for name in $2 $2-qt5 $2-qt4; do
+                if test -x "${tool}/${name}"; then
+                    $1="${tool}/${name}"
+                    break
+                fi
+            done
+        fi
+    done
+    if ! test -x "${$1}"; then
+      if which "$2" > /dev/null; then
+        $1=$2
+      elif which "$2-qt5" > /dev/null; then
         $1=$2-qt5
       elif which "$2" > /dev/null; then
         $1=$2
@@ -70,15 +85,15 @@ AC_DEFUN([AX_CXX_QT_TOOL], [
         $1=$2-qt4
       else
         HAVE_$1=0
-        $1=""
+        unset $1
       fi
     fi
     AC_SUBST($1)
     AM_CONDITIONAL(HAVE_$1, test $HAVE_[$1] -eq 1)
     if test $HAVE_$1 -eq 1; then
-      AC_MSG_RESULT([$$1])
+        AC_MSG_RESULT([$$1])
     else
-      AC_MSG_RESULT([not found])
+        AC_MSG_RESULT([not found])
     fi
   fi
 ])
@@ -215,6 +230,7 @@ AC_DEFUN([AX_CHECK_QT], [
   AC_SUBST(CXXFLAGS)
   AC_SUBST(PKG_REQUIREMENTS)
   AX_ADDITIONAL_QT_RULES_HACK='
+#### Begin: Appended by $0
 
 LANGUAGE_FILE_BASE ?= translations
 
@@ -226,7 +242,6 @@ moc_%.cxx: %.hxx
 
 qrc_%.cxx: %.qrc
 	$(RCC) -o [$][@] -name ${<:%.qrc=%} $<
-  AC_SUBST(AX_ADDITIONAL_QT_RULES_HACK)
 
 #%.qrc: %
 #	cwd=$$(pwd) && cd $< && $(RCC) -project -o $${cwd}/[$][@]
@@ -234,12 +249,15 @@ qrc_%.cxx: %.qrc
 %.qm: %.ts
 	${LRELEASE} $< -qm [$][@]
 
-%.ts: ${LANGUAGE_FILES:%=%}
+%.ts: ${LANGUAGE_FILES}
 	${LUPDATE} -no-obsolete \
-	           -target-language ${@:${LANGUAGE_FILE_BASE}_%.ts=%} \
-	           -ts [$][@] $<
+	           -target-language [$]{@:${LANGUAGE_FILE_BASE}_%.ts=%} \
+                   [$][^] \
+	           -ts [$][@]
 
-'])
+#### End: $0
+'
+])
 
 AC_DEFUN([AX_REQUIRE_QT], [
   AX_CHECK_QT([$1], [$2], [$3], [$4])
@@ -254,3 +272,13 @@ AC_DEFUN([AX_REQUIRE_QT], [
 AC_DEFUN([AX_QT_NO_KEYWORDS], [
   CPPFLAGS+=" -DQT_NO_KEYWORDS"
 ])
+
+AC_DEFUN([AX_INIT_QT], [
+  if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
+    for f in $(find test examples src -name makefile.in); do
+      test -f "$f" && cat >> "$f" <<EOF
+${AX_ADDITIONAL_QT_RULES_HACK}    
+EOF
+    done
+  fi
+])
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 8aa6ee9..742db8d 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -13,12 +13,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
     mrw_esyscmd_s([
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
-        if test -d .svn; then
-          svn upgrade 1>&2 > /dev/null || true
+        if test -d ${path}/.svn; then
+          (cd $path; svn upgrade 1>&2 > /dev/null || true)
           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
           if test -n "${VCS_REVISION}"; then break; fi
-        elif test -d .git; then
-          VCS_REVISION=$(git rev-list --all --count)
+        elif test -d ${path}/.git; then
+          VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
           if test -n "${VCS_REVISION}"; then break; fi
         fi
       done
@@ -26,12 +26,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
     ]),  mrw_esyscmd_s([
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
-        if test -d .svn; then
-          svn upgrade 1>&2 > /dev/null || true
+        if test -d ${path}/.svn; then
+          (cd $path; svn upgrade 1>&2 > /dev/null || true)
           VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
           if test -n "${VCS_REVISION}"; then break; fi
-        elif test -d .git; then
-          VCS_REVISION=$(git rev-list --all --count)
+        elif test -d ${path}/.git; then
+          VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
           if test -n "${VCS_REVISION}"; then break; fi
         fi
       done
@@ -44,12 +44,12 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
 m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
   VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
   for path in . .. ../.. ../../..; do
-    if test -d .svn; then
-      svn upgrade 1>&2 > /dev/null || true
+    if test -d ${path}/.svn; then
+      (cd $path; svn upgrade 1>&2 > /dev/null || true)
       VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
       if test -n "${VCS_REVISION}"; then break; fi
-    elif test -d .git; then
-      VCS_REVISION=$(git rev-list --all --count)
+    elif test -d ${path}/.git; then
+      VCS_REVISION=$(cd ${path} > /dev/null 2/dev/null; git rev-list --all --count)
       if test -n "${VCS_REVISION}"; then break; fi
     fi;
   done
@@ -90,7 +90,7 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice.
 #     $3 = filename of makefile.in
 AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
   sh_add_makefile_target_dep() {
-    sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
+    sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'"${1}"':.*$/& '"${2}"'/' "${srcdir}/${3}"
     if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
         echo "${1}: ${2}" >> "${srcdir}/${3}"
     fi
@@ -137,6 +137,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(PREFIX)
   SYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${sysconfdir}")
   AX_SUBST(SYSCONFDIR)
+  PKGSYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${SYSCONFDIR}/${PACKAGE_NAME}")
+  AX_SUBST(PKGSYSCONFDIR)
   DATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${datadir}")
   AX_SUBST(DATADIR)
   PKGDATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${DATADIR}/${PACKAGE_NAME}")
@@ -167,15 +169,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
-  DEB_DEPEND_IFEXISTS=
-  DEB_BUILD_DEPEND=
-  DEB_DEPEND=
-  AC_SUBST(DEB_DEPEND_IFEXISTS)
-  AC_SUBST(DEB_BUILD_DEPEND)
-  AC_SUBST(DEB_DEPEND)
   if test -f README.md; then
     README=$(tail -n +3 README.md)
-    DESCRIPTION=$(head -1 README.md)
+    DESCRIPTION=$(head -1 README.md | sed 's,^#\+ *,,;s, *#\+$,,')
   else
     README=$(tail -n +3 README)
     DESCRIPTION=$(head -1 README)
@@ -229,6 +225,9 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
   AX_SUBST(VENDOR)
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
+  if test "${DISTRO}" = "n/a"; then
+     DISTRO="${VENDOR}_$(lsb_release -sr 2>/dev/null | tr ' ' '_')"
+  fi
   AX_SUBST(DISTRO)
   ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
   AX_SUBST(ARCH)
@@ -457,6 +456,12 @@ AC_DEFUN([AX_USE_NODEJS], [
                          [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
   AC_CONFIG_FILES([nodejs/package.json])
   AC_CONFIG_FILES([nodejs/makefile])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([web])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Applications/Internet])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
   test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
 #### Begin: Appended by $0
@@ -495,6 +500,12 @@ EOF
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML], [
   AC_CONFIG_FILES([html/makefile])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([web])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Applications/Internet])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in])
   test -f html/makefile.in && cat >> html/makefile.in <<EOF
 #### Begin: Appended by $0
@@ -504,6 +515,12 @@ maintainer-clean-html-targets:
 EOF
 ])
 
+# use this in configure.ac to support HTML data for webservers
+AC_DEFUN([AX_BUILD_HTML_NPM], [
+  AC_CONFIG_FILES([html/package.json])
+  AX_BUILD_HTML
+])
+
 # use this in configure.ac to support C++ libraries
 AC_DEFUN([AX_USE_LIBTOOL], [
   # libtool versioning
@@ -516,6 +533,12 @@ AC_DEFUN([AX_USE_LIBTOOL], [
   AC_SUBST(LIB_VERSION)
   AC_PROG_LIBTOOL
   AC_CONFIG_FILES([src/${PACKAGE_NAME}.pc])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([devel])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Development/Libraries])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-libtool-pkg], [src/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-data-am], [src/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([uninstall-data-am], [uninstall-data-libtool-pkg], [src/makefile.in])
@@ -533,7 +556,11 @@ EOF
 ])
 
 # use this in configure.ac to support debian packages
+#  - $1: optional debian package section
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
+  if test -n "$1"; then
+    AX_DEB_SECTION([$1])
+  fi
   if test -f README.md; then
     README_DEB=$(tail -n +3 README.md | sed -e 's/^ *$/./g' -e 's/^/ /g')
   else
@@ -551,6 +578,7 @@ clean-debian-targets:
 	-rm -rf \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.{dsc,tar.gz} \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}*.changes \$\$(sed -n 's,Package: \(.*\),\1_${PACKAGE_VERSION}~${DISTRO}.${BUILD_NUMBER}*.deb,p;' debian/control)
 deb: distdir
 	cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export  DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
+	gpg --verify \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.dsc
 distclean-debian-targets:
 	-rm debian/changelog debian/control
 #### End: $0
@@ -558,7 +586,11 @@ EOF
 ])
 
 # use this in configure.ac to support RPM packages
+#  - $1: optional rpm package group
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
+  if test -n "$1"; then
+    AX_RPM_GROUP([$1])
+  fi
   AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
@@ -568,7 +600,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
-	rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
+	./rpmsign.exp "\${PACKAGER}" "\{PASSWORD}" RPMS/*/*.rpm SRPMS/*.rpm
 clean-rpm-targets:
 	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
@@ -577,6 +609,11 @@ distclean-rpm-targets:
 EOF
 ])
 
+# use this in configure.ac to support scripts, e.g. bash scripts
+AC_DEFUN([AX_USE_ETC], [
+  AC_CONFIG_FILES([etc/makefile])
+])
+
 # use this in configure.ac to support scripts, e.g. bash scripts
 AC_DEFUN([AX_USE_SCRIPTS], [
   AC_CONFIG_FILES([scripts/makefile])
@@ -587,7 +624,7 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
   AC_CHECK_PROG(have_dot, dot, yes, no)
   AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
-  AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v) | sort -V | head -1))
+  AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v 2>/dev/null) | sort -V | head -1))
   PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
   AC_SUBST(PDF_DOC)
   if test "$have_doxygen" = "no"; then
@@ -707,6 +744,13 @@ EOF
 #     $4 = alternative module names (space separated, optional)
 #     $5 = optional flags:
 #            manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
+#     $6 = optional parameters, allowed are (evaluated in this order):
+#           - DEV_RPM_DIST_PKG=<name>
+#             special name for the RPM development package
+#           - DEV_DEB_DIST_PKG=<name>
+#             special name for the debian development package
+#           - DEV_DIST_PKG=<name>
+#             if the name of the development package is different
 #
 # uses PKG_CHECK_MODULES to test for a module
 # then, if given, looks for the header file
@@ -807,6 +851,33 @@ AC_DEFUN([AX_PKG_REQUIRE], [
   else
     AC_MSG_NOTICE([To enable $1, add $1_CPPFLAGS, $1_CXXFLAGS and $1_LIBS])
   fi
+  
+  DEV_DEB_DIST_PKG=
+  DEV_RPM_DIST_PKG=
+  DEV_DIST_PKG=
+  pkg=m4_default([$2], [$1])
+  $6
+  dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
+  rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
+  if test -n "$4"; then
+    for f in $pkg $4; do
+      if test -n "$(apt-cache policy -q ${f}-dev 2> /dev/null)"; then
+        deb_pkg=${f}-dev
+        break
+      fi
+    done
+    for f in $pkg $4; do
+      if (test -x /usr/bin/zypper && zypper search -x "${f}-devel" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/dnf && dnf list -q "${f}-devel" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/yum && yum list -q "${f}-devel" 1>&2 > /dev/null) || \
+            (test -x /usr/sbin/urpmq && urpmq "${f}-devel" 1>&2 > /dev/null); then
+        rpm_pkg=${f}-devel
+        break
+      fi
+    done
+  fi
+  AX_DEB_BUILD_DEPEND([$deb_pkg])
+  AX_RPM_BUILD_DEPEND([$rpm_pkg])
 ])
 
 # check if a specific package exists
@@ -815,6 +886,13 @@ AC_DEFUN([AX_PKG_REQUIRE], [
 #     $2 = module name (optional, if different from id)
 #     $3 = optional flags:
 #          manualflags if CXXFLAGS, CPPFLAGS, LIBS should remain unchanged
+#     $4 = optional parameters, allowed are (evaluated in this order):
+#           - DEV_RPM_DIST_PKG=<name>
+#             special name for the RPM development package
+#           - DEV_DEB_DIST_PKG=<name>
+#             special name for the debian development package
+#           - DEV_DIST_PKG=<name>
+#             if the name of the development package is different
 #
 # uses PKG_CHECK_MODULES to test for a module
 # sets automake conditional HAVE_$1 to 0 (not found) or 1 (found)
@@ -849,6 +927,23 @@ AC_DEFUN([AX_PKG_CHECK], [
   AC_SUBST(CPPFLAGS)
   AC_SUBST(CXXFLAGS)
   AC_SUBST(PKG_REQUIREMENTS)
+  
+  DEV_DEB_DIST_PKG=
+  DEV_RPM_DIST_PKG=
+  DEV_DIST_PKG=
+  pkg=m4_default([$2], [$1])
+  $4
+  dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
+  rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
+  if test -n "$(apt-cache policy -q ${deb_pkg} 2> /dev/null)"; then
+    AX_DEB_BUILD_DEPEND([$deb_pkg])
+  fi
+  if (test -x /usr/bin/zypper && zypper search -x "$rpm_pkg" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/dnf && dnf list -q "$rpm_pkg" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/yum && yum list -q "$rpm_pkg" 1>&2 > /dev/null) || \
+            (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then
+    AX_RPM_BUILD_DEPEND([$rpm_pkg])
+  fi
 ])
 
 # make sure, a specific header exists
@@ -974,36 +1069,165 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
-  pkg=$1
+  pkg="$1"
   if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
-     DEB_DEPEND_IFEXISTS+=", ${pkg}"
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
   fi
-  AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])
 
 # require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_BUILD_DEPEND], [
-  pkg=$1
-  DEB_BUILD_DEPEND+=", ${pkg}"
-  AC_SUBST(DEB_BUILD_DEPEND)
+  pkg="$1"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND], [
-  pkg=$1
-  DEB_DEPEND+=", ${pkg}"
-  AC_SUBST(DEB_DEPEND)
+  pkg="$1"
+  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
 ])
 
 # require package in debian/control.in append @DEB_DEPEND@ to Depends
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_SECTION], [
-  pkg=$1
+  pkg="$1"
   DEB_SECTION="${pkg}"
+])
+
+# call after setting debian dependencies
+AC_DEFUN([AX_DEB_RESOLVE], [
+  AC_SUBST(DEB_BUILD_DEPEND)
+  AC_SUBST(DEB_DEPEND)
   AC_SUBST(DEB_SECTION)
+  AC_SUBST(DEB_DEPEND_IFEXISTS)
+])
+
+# Check if a package exists in the current distribution, if yes, require it
+# in .spec.in append @RPM_DEPEND_IFEXISTS@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
+  pkg="$1"
+  
+  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
+       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
+  fi
+])
+
+# require package in .spec.in append @RPM_BUILD_DEPEND@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_RPM_BUILD_DEPEND], [
+  pkg="$1"
+  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
+])
+
+# require package in .spec.in append @RPM_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_RPM_DEPEND], [
+  pkg="$1"
+  if test -z "${RPM_DEPEND}"; then
+    RPM_DEPEND="${pkg}"
+  else
+    RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
+  fi
+])
+
+# require package in debian/control.in append @DEB_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_RPM_GROUP], [
+  pkg="$1"
+  RPM_GROUP="${pkg}"
+])
+
+# call after setting rpmian dependencies
+AC_DEFUN([AX_RPM_RESOLVE], [
+  AC_SUBST(RPM_BUILD_DEPEND)
+  AC_SUBST(RPM_DEPEND)
+  AC_SUBST(RPM_GROUP)
+  AC_SUBST(RPM_DEPEND_IFEXISTS)
+])
+
+# Check if a package exists in the current distribution, if yes, require it
+# in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_DEPEND_IFEXISTS], [
+  pkg="$1"
+  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
+  fi
+  if (test -x /usr/bin/zypper && zypper search -x "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/bin/dnf && dnf list -q "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/bin/yum && yum list -q "$pkg" 1>&2 > /dev/null) || \
+     (test -x /usr/sbin/urpmq && urpmq "$pkg" 1>&2 > /dev/null); then
+       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}"
+  fi
+])
+
+# Check if a package exists in the current distribution, if yes, require it
+# in .spec.in append @ALL_DEPEND_IFEXISTS@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_DEPEND_IFEXISTS_DEV], [
+  pkg="$1"
+  if test -n "$(apt-cache policy -q ${pkg}-dev 2> /dev/null)"; then
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}-dev"
+  fi
+  if (test -x /usr/bin/zypper && zypper search -x "$pkg"-devel 1>&2 > /dev/null) || \
+     (test -x /usr/bin/dnf && dnf list -q "$pkg"-devel 1>&2 > /dev/null) || \
+     (test -x /usr/bin/yum && yum list -q "$pkg"-devel 1>&2 > /dev/null) || \
+     (test -x /usr/sbin/urpmq && urpmq "$pkg"-devel 1>&2 > /dev/null); then
+       RPM_DEPEND_IFEXISTS="${RPM_DEPEND_IFEXISTS}, ${pkg}-devel"
+  fi
+])
+
+# require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_BUILD_DEPEND], [
+  pkg="$1"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
+  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
+])
+
+# require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_BUILD_DEPEND_DEV], [
+  pkg="$1"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg// /-dev}-dev"
+  RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg// /-devel}-devel"
+])
+
+# require package in .spec.in append @ALL_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_ALL_DEPEND], [
+  pkg="$1"
+  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
+  if test -z "${RPM_DEPEND}"; then
+    RPM_DEPEND="${pkg}"
+  else
+    RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
+  fi
+])
+
+# finish configuration - to be called instead of AC_OUTPUT
+AC_DEFUN([AX_OUTPUT], [
+  AX_INIT_QT
+  AX_DEB_RESOLVE
+  AX_RPM_RESOLVE
+  AC_OUTPUT
+  AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}])
 ])
diff --git a/bootstrap.sh b/bootstrap.sh
index 35647d5..705fb76 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -31,8 +31,9 @@ while test $# -gt 0; do
         (--configure|-c) configure=1;;
         (--docker|-d) docker=1;;
         (--build|-b) configure=1; build=1; buildtarget+=" distcheck";;
-        (--all|-a) shift; configure=1; build=1; buildtarget+=" all";;
-        (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";;
+        (--all|-a) configure=1; build=1; buildtarget+=" all";;
+        (--install|-i) configure=1; build=1; buildtarget+=" all install";;
+        (--clean) configure=1; build=1; buildtarget+=" maintainer-clean";;
         (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";;
         (--overwrite|-o) overwrite=1;;
         (--rebuild|-r) rebuild=1;;
@@ -53,6 +54,7 @@ OPTIONS
   --docker, -d               build and run tests in a docker instance
   --build, -b                build, also call ./configure && make distcheck
   --all, -a                  same as -b, but make target all
+  --install, -i              same as -a, but add make install
   --clean                    same as -b, but make target maintainer-clean
   --target, -t <target>      same as -b, but specify target instead of distcheck
   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
@@ -86,7 +88,7 @@ DESCRIPTION
   ${DEFAULT_PROJECT_NAME} as the project name for your project in
   ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a
   checked out the bootstrap-build-environment from
-  https://dev.marc.waeckerlin.org/, and the path from where you call
+  https://mrw.sh/, and the path from where you call
   ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to
   your newly created project. Please note that your project must be a
   checked out subversion or git repository, since this build
@@ -96,7 +98,7 @@ DESCRIPTION
   subversion on https:/path/to/your/new-project:
 
     cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
            bootstrap-build-environment
     svn co https:/path/to/your/new-project/trunk new-project
     cd new-project
@@ -106,7 +108,7 @@ DESCRIPTION
   git on https:/path/to/your/new-project:
 
     cd ~/svn
-    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+    svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\
            bootstrap-build-environment
     cd ~/git
     git clone https:/path/to/your/new-project
@@ -134,20 +136,25 @@ GENERATED FILES
     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
     * build-in-docker.sh - script to build the project encapsulated in a docker container
     * build-in-docker.conf - additional configuration for build-in-docker.sh
+    * rpmsign.exp - script for signing rpms unattended
     * build-resource-file.sh - build resource.qrc file from a resource directory
     * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
+    * dependency-graph.sh - script to draw project dependencies
+    * template.sh - generic template for bash scripts
     * test/runtests.sh - template file to run test scripts, i.e. docker based
     * AUTHORS - replace your name in AUTHORS before first run
     * NEWS - empty file add your project's news
-    * README - add project description (first line is header, followed by an empty line)
+    * README (or README.md) - add project description (first line: header, followed by empty line)
     * configure.ac - global configuration file template
     * makefile.am - global makefile template
     * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file
     * src/makefile.am - if you enabled AX_USE_CXX
     * src/version.hxx - if you enabled AX_USE_CXX
     * src/version.cxx - if you enabled AX_USE_CXX
-    * html/makefile.am - if you enabled AX_BUILD_HTML
+    * etc/makefile.am - if you enable AX_USE_ETC
+    * html/makefile.am - if you enabled AX_BUILD_HTML or AX_BUILD_HTML_NPM
+    * html/package.json.in - if you enabled AX_BUILD_HTML_NPM
     * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
     * nodejs/makefile.am - if you add AX_USE_NODEJS
     * nodejs/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
@@ -222,7 +229,7 @@ FILE DEPENDENCIES
   configuration a dependent, i.e.:
 
     * test/makefile.am depends on AX_USE_LIBTOOL
-    * html/makefile.am depends on AX_BUILD_HTML
+    * html/makefile.am depends on AX_BUILD_HTML or AX_BUILD_HTML_NPM
     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
     * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_PERLDOC,
       AX_USE_CPPUNIT AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
@@ -256,6 +263,7 @@ FILES
                   number. In git, git rev-list --all --count is used.
                   The following macros are supported in configure.ac:
       * Enable C++: AX_USE_CXX
+      * Enable system config files in /etc: AX_USE_ETC
       * Enable LibTool library creation: AX_USE_LIBTOOL
       * Enable Scripts: AX_USE_SCRIPTS
       * Enable NodeJS project: AX_USE_NODEJS
@@ -296,50 +304,65 @@ EOF
     shift;
 done
 
-echo -en "\e[1m-> checking:\e[0m for version control system ..."
-VCS=""
-VCSDEPENDS=""
-if test -d .svn; then
-    VCS="svn"
-    VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
-    VCSDEPENDS_RPM="subversion,"
-    echo -e " \e[32msuccess\e[0m detected ${VCS}"
-elif test -d .git; then
-    VCS="git"
-    VCSDEPENDS_DEB="git2cl, git,"
-    VCSDEPENDS_RPM="git,"
-    echo -e " \e[32msuccess\e[0m detected ${VCS}"
-else
-    echo -e " \e[33mignored\e[0m"
+# check if stdout is a terminal...
+if test -t 1; then
+
+    # see if it supports colors...
+    ncolors=$(tput colors)
+
+    if test -n "$ncolors" && test $ncolors -ge 8; then
+        bold="$(tput bold)"
+        underline="$(tput smul)"
+        standout="$(tput smso)"
+        normal="$(tput sgr0)"
+        black="$(tput setaf 0)"
+        red="$(tput setaf 1)"
+        green="$(tput setaf 2)"
+        yellow="$(tput setaf 3)"
+        blue="$(tput setaf 4)"
+        magenta="$(tput setaf 5)"
+        cyan="$(tput setaf 6)"
+        white="$(tput setaf 7)"
+    fi
 fi
 
-HEADER='## @id '"\$Id\$"'
-##
-## This file has been added:
-##  - by '${MY_NAME}'
-##  -  on '$(LANG= date +"%a, %d %B %Y %H:%M:%S %z")'
-## Feel free to change it or even remove and rebuild it, up to your needs
-##
-##       1         2         3         4         5         6         7         8
-## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+notice() {
+    echo "${yellow}→ notice: ${bold}$*${normal}"
+}
 
-'
+running() {
+    echo -n "${bold}${blue}→ running: ${bold}${white}$*${normal} … "
+}
 
-CHEADER='/** @id '"\$Id\$"'
+checking() {
+    echo -n "${bold}${blue}→ checking: ${bold}${white}$*${normal} … "
+}
 
-   This file has been added:
-     - by '${MY_NAME}'
-     - on '$(LANG= date +"%a, %d %B %Y %H:%M:%S %z")'
+generating() {
+    echo -n "${bold}${blue}→ generating: ${bold}${white}$*${normal} … "
+}
 
-*/
-//       1         2         3         4         5         6         7         8
-// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+configuring() {
+    echo -n "${bold}${blue}→ configuring ${bold}${white}$1${normal}:"
+    shift
+    echo -n "${white}$*${normal} … "
+}
 
+ignored() {
+    echo "${bold}${yellow}ignored $*${normal}"
+}
 
-'
+success() {
+    echo "${bold}${green}success $*${normal}"
+}
 
-notice() {
-    echo -e "\e[1;33m$*\e[0m"
+error() {
+    echo "${bold}${red}→ error: $1${normal}"
+    shift
+    if test -n "$*"; then
+        echo "${bold}$*${normal}"
+    fi
+    exit 1
 }
 
 run() {
@@ -351,28 +374,70 @@ run() {
         esac
         shift;
     done
-    echo -en "\e[1m-> running:\e[0m $* ..."
+    running $*
     result=$($* 2>&1)
     res=$?
     if test $res -ne 0; then
         if test $check -eq 1; then
-            echo -e " \e[31merror\e[0m"
-            echo -e "\e[1m*** Failed with return code: $res\e[0m"
-            if test -n "$result"; then
-                echo "$result"
-            fi
-            exit 1
+            error "Failed with return code: $res" "$result"
         else
-            echo -e " \e[33mignored\e[0m"
+            ignored
         fi
     else
-        echo -e " \e[32msuccess\e[0m"
+        success
     fi
 }
 
+checking for version control system
+VCS=""
+VCSDEPENDS=""
+for path in . .. ../.. ../../..; do
+    if test -d ${path}/.svn; then
+        VCS="svn"
+        VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
+        VCSDEPENDS_RPM="subversion, "
+        success detected ${VCS}
+        break
+    elif test -d ${path}/.git; then
+        VCS="git"
+        VCSDEPENDS_DEB="git2cl, git,"
+        VCSDEPENDS_RPM="git, "
+        success detected ${VCS}
+        break
+    fi
+done
+if test -z "$VCS"; then
+    ignored
+fi
+
+HEADER='## @id '"\$Id\$"'
+##
+## This file has been added:
+##  - by '${MY_NAME}'
+##  -  on '$(LANG= date +"%a, %d %B %Y %H:%M:%S %z")'
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+'
+
+CHEADER='/** @id '"\$Id\$"'
+
+   This file has been added:
+     - by '${MY_NAME}'
+     - on '$(LANG= date +"%a, %d %B %Y %H:%M:%S %z")'
+
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+
+'
+
 testtag() {
     local IFS="|"
-    egrep -q '^ *'"($*)" configure.ac
+    egrep -q '^ *'"($*)"' *(\(.*)? *$' configure.ac
 }
 
 contains() {
@@ -422,18 +487,13 @@ to() {
         return 1
     fi
     checkdir "$(dirname ${1})"
-    echo -en "\e[1m-> generating:\e[0m $1 ..."
+    generating $1
     result=$(cat > "$1" 2>&1)
     res=$?
     if test $res -ne 0; then
-        echo -e " \e[31merror\e[0m"
-        echo -e "\e[1m*** Failed with return code: $res\e[0m"
-        if test -n "$result"; then
-            echo "$result"
-        fi
-        exit 1
+        error "Failed with return code: $res" "$result"
     else
-        echo -e " \e[32msuccess\e[0m"
+        success
     fi
     run chmod $mode $1
     if test $exists -eq 0; then
@@ -475,24 +535,20 @@ copy() {
 }
 
 doxyreplace() {
-    echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..."
+    configuring doxyfile $1
     if sed -i 's|\(^'"$1"' *=\) *.*|\1'" $2"'|g' doc/doxyfile.in; then
-        echo -e " \e[32msuccess\e[0m"
+        success
     else
-        echo -e " \e[31merror\e[0m"
-        echo -e "\e[1m**** command: $0 $*\e[0m"
-        exit 1
+        error $0 $*
     fi
 }
 
 doxyadd() {
-    echo -en "\e[1m-> doxyfile:\e[0m configure $1 ..."
+    configuring  doxyfile $1
     if sed -i '/^'"$1"' *=/a'"$1"' += '"$2" doc/doxyfile.in; then
-        echo -e " \e[32msuccess\e[0m"
+        success
     else
-        echo -e " \e[31merror\e[0m"
-        echo -e "\e[1m**** command: $0 $*\e[0m"
-        exit 1
+        error $0 $*
     fi
 }
 
@@ -503,13 +559,18 @@ vcs2cl() {
     else
         touch "ChangeLog"
     fi
+    if test -x $(which timeout); then
+        local TIMEOUT="timeout 10"
+    else
+        local TIMEOUT=
+    fi
     if test -x $(which ${VCS}2cl); then
         if test "${VCS}" = "git"; then
-            ${VCS}2cl > ChangeLog
+            $TIMEOUT ${VCS}2cl || true > ChangeLog
         elif test "${VCS}" = "svn"; then
-            ${VCS}2cl --break-before-msg -a -i
+            $TIMEOUT ${VCS}2cl --break-before-msg -a -i || true
         elif test -n "${VCS}"; then
-            ${VCS}2cl
+            $TIMEOUT ${VCS}2cl || true
         fi
     fi
     if test $exists -eq 0; then
@@ -536,9 +597,12 @@ copy makefile_test.inc.am
 copy resolve-debbuilddeps.sh
 copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
+copy rpmsign.exp
 copy build-resource-file.sh
 copy sql-to-dot.sed
 copy mac-create-app-bundle.sh
+copy dependency-graph.sh
+copy template.sh
 AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
 if test -z "${AUTHOR}"; then
     AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
@@ -549,11 +613,18 @@ EOF
 to NEWS <<EOF && notice "please edit NEWS"
 $(date) created ${DEFAULT_PROJECT_NAME}
 EOF
-to README <<EOF && notice "please edit README"
+if test -e README.md; then
+    README=README.md
+else
+    README=README
+    to README <<EOF && notice "please edit README"
+
 ${DEFAULT_PROJECT_NAME}
 
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
+fi
+DESCRIPTION=$(head -1 $README | sed 's,^#\+ *,,;s, *#\+$,,')
 to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
 ${HEADER}# default is generated from AUTHORS and project name
 PROJECT_URL=
@@ -569,6 +640,7 @@ AX_INIT_STANDARD_PROJECT
 
 # requirements, uncomment, what you need:
 #AX_USE_CXX
+#AX_USE_ETC
 #AX_USE_LIBTOOL
 #AX_USE_SCRIPTS
 #AX_USE_NODEJS
@@ -580,6 +652,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
 #AX_BUILD_HTML
+#AX_BUILD_HTML_NPM
 
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
@@ -587,7 +660,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_QT_NO_KEYWORDS
 
 # create output
-AC_OUTPUT
+AX_OUTPUT
 EOF
 
 PACKAGE_NAME=$(sed -n 's/.*m4_define *( *x_package_name *, *\([^ ]*\) *).*/\1/p' configure.ac)
@@ -627,7 +700,7 @@ LANGUAGE_FILE_BASE = ${PACKAGE_NAME}
 QT_PLUGINS = iconengines imageformats platforms
 
 #### enable if you deliver a KDE/Gnome desktop file
-#applicationsdir = ${datarootdir}/applications
+#applicationsdir = \${datarootdir}/applications
 #dist_applications_DATA = ${PACKAGE_NAME}.desktop
 
 #### enable (ev. instead of bin_PROGRAMS) if you build a library
@@ -664,25 +737,26 @@ ${PACKAGE_NAME//-/_}_TR_FILES = main.cxx version.cxx
 ${PACKAGE_NAME//-/_}_SOURCES = \${${PACKAGE_NAME//-/_}_TR_FILES} \${BUILT_SOURCES}
 
 ## automatic assembly, no need to change
-BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \
-                \${${PACKAGE_NAME//-/_}_UIFILES} \
-                \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \
+BUILT_SOURCES = \${${PACKAGE_NAME//-/_}_MOCFILES} \\
+                \${${PACKAGE_NAME//-/_}_UIFILES} \\
+                \${${PACKAGE_NAME//-/_}_TRANSLATIONS} \\
                 \${${PACKAGE_NAME//-/_}_RESOURCES}
 
 ## automatic assembly, no need to change
-EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \
+EXTRA_DIST_TR = \${${PACKAGE_NAME//-/_}_MOCFILES:moc_%.cxx=%.hxx} \\
                 \${${PACKAGE_NAME//-/_}_UIFILES:ui_%.hxx=%.ui}
 
 ## automatic assembly, no need to change
 ## except: adapt the pre-delivered qt_%.qm list (language files you copy from qt
-EXTRA_DIST = \${EXTRA_DIST_TR} \
-             \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx:%.qrc} \
-             \${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \
+EXTRA_DIST = \${EXTRA_DIST_TR} \\
+             \${${PACKAGE_NAME//-/_}_RESOURCES:qrc_%.cxx=%.qrc} \\
+             \${${PACKAGE_NAME//-/_}_TRANSLATIONS:%.qm=%.ts} \\
              qt_de.qm qt_fr.qm
 
 ## automatic assembly, no need to change
 LANGUAGE_FILES = \${EXTRA_DIST_TR} \${${PACKAGE_NAME//-/_}_TR_FILES}
 
+CLEANFILES = \${${PACKAGE_NAME//-/_}_RESOURCES}
 MAINTAINERCLEANFILES = makefile.in
 EOF
     to --condition AX_USE_CXX src/main.cxx <<EOF
@@ -859,6 +933,13 @@ namespace NAMESPACE {
   const std::string IDENT("\$Id: " PACKAGE_STRING);
 }
 EOF
+to --condition AX_USE_ETC etc/makefile.am <<EOF
+${HEADER}pkgsysconfdir = \${sysconfdir}/@PACKAGE_NAME@
+
+dist_pkgsysconf_DATA = 
+
+MAINTAINERCLEANFILES = makefile.in
+EOF
 to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
 ${HEADER}dist_bin_SCRIPTS =
 
@@ -1011,24 +1092,25 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
       "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
     },
     "ldap": {
-      "url": "ldap://dev.marc.waeckerlin.org",
-      "adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "url": "ldap://your.ldap.host",
+      "adminDn": "cn=tmp,ou=system,ou=people,dc=your,dc=ldap,dc=host",
       "adminPassword": "secret",
-      "searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "searchBase": "ou=person,ou=people,dc=your,dc=ldap,dc=host",
       "searchFilter": "(uid={{username}})"
     }
   }
 }
 EOF
+PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]._-')
 to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
-#EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
-#${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME^^}.log"
-#${PACKAGE_NAME^^}="${PACKAGE_NAME}"
-#${PACKAGE_NAME^^}_PORT="8888"
+#EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
+#${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
+#${PACKAGE_NAME_UPPER}="${PACKAGE_NAME}"
+#${PACKAGE_NAME_UPPER}_PORT="8888"
 EOF
 to --condition AX_USE_NODEJS nodejs/etc/init/${PACKAGE_NAME}.conf <<EOF
 #!upstart
-description "$(head -1 README)"
+description "$DESCRIPTION"
 author      "$(head -1 AUTHORS)"
 
 start on (local-filesystems and net-device-up)
@@ -1040,38 +1122,40 @@ script
     echo \$\$ > /var/run/${PACKAGE_NAME}.pid
     # there are some useful defaults
     # do not edit this file, overwrite values in /etc/default/${PACKAGE_NAME}
-    EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
-    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
-    ${PACKAGE_NAME^^}_USER="${PACKAGE_NAME}"
-    ${PACKAGE_NAME^^}_PORT=""
+    EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
+    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
+    ${PACKAGE_NAME_UPPER}_USER="${PACKAGE_NAME}"
+    ${PACKAGE_NAME_UPPER}_PORT=""
     [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
-    if test -n "\${${PACKAGE_NAME^^}_USER}"; then
-        exec sudo -u "\${${PACKAGE_NAME^^}_USER}" \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
+    if test -n "\${${PACKAGE_NAME_UPPER}_USER}"; then
+        exec sudo -u "\${${PACKAGE_NAME_UPPER}_USER}" \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1
     else
-        exec \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
+        exec \${EXEC_${PACKAGE_NAME_UPPER}} \${${PACKAGE_NAME_UPPER}_PORT} >> \${${PACKAGE_NAME_UPPER}_LOG} 2>&1
     fi
 end script
 
 pre-start script
-    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
+    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
     [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
     # Date format same as (new Date()).toISOString() for consistency
-    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME^^}_LOG}
+    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME_UPPER}_LOG}
 end script
 
 pre-stop script
-    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
+    ${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"
     [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
     rm /var/run/${PACKAGE_NAME}.pid
-    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME^^}_LOG}
+    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME_UPPER}_LOG}
 end script
 EOF
 to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service <<EOF
 [Unit]
-Description=$(head -1 README)
+Description=$DESCRIPTION
 
 [Service]
-ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME} > /var/log/${PACKAGE_NAME}.log
+ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}
+StandardOutput=journal
+StandardError=journal
 Restart=on-abort
 
 [Install]
@@ -1194,11 +1278,11 @@ to --condition AX_USE_NODEJS nodejs/views/index.ejs <<EOF
     <link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="/socket.io/socket.io.js"></script>
     <script type="text/javascript" src="javascripts/${PACKAGE_NAME}.js"></script>
-    <title>$(head -1 README)</title>
+    <title>$DESCRIPTION</title>
   </head>
 
   <body>
-    <h1>$(head -1 README)</h1>
+    <h1>$DESCRIPTION</h1>
     <p>generated by bootstrap, please edit</p>
   </body>
 </html>
@@ -1268,13 +1352,64 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}
 
+exampledir = ${docdir}/examples
+example_DATA = 
+
 MAINTAINERCLEANFILES = makefile.in
 EOF
-to --condition AX_BUILD_HTML html/makefile.am <<EOF
-${HEADER}EXTRA_DIST = \${www_DATA}
+to --condition AX_BUILD_HTML_NPM html/package.json.in <<EOF
+{
+  "name": "@PACKAGE_NAME@",
+  "version": "@PACKAGE_VERSION@",
+  "private": true,
+  "dependencies": {
+  },
+  "description": "@DESCRIPTION@",
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "@AUTHOR@",
+  "license": "@LICENSE@",
+  "path": {
+      "prefix": "@PREFIX@",
+      "sysconf": "@SYSCONFDIR@",
+      "pkgdata": "@PKGDATADIR@",
+      "localstate": "@LOCALSTATEDIR@",
+      "log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
+      "config":  "@SYSCONFDIR@/@PACKAGE_NAME@.json",
+      "nodejs": "@PKGDATADIR@/nodejs"
+  }
+}
+EOF
+to --condition 'AX_BUILD_HTML|AX_BUILD_HTML_NPM' html/makefile.am <<EOF
+${HEADER}EXTRA_DIST = $(testtag AX_BUILD_HTML_NPM && echo "package.json.in")
 
 wwwdir = \${pkgdatadir}/html
-www_DATA = 
+www_DATA = $(testtag AX_BUILD_HTML_NPM && echo "package.json")
+dist_www_DATA = 
+
+$(if testtag AX_BUILD_HTML_NPM; then
+cat<<EOF2
+
+all: node_modules
+
+node_modules: package.json.in
+	HOME=. npm install
+
+clean-local:
+	-rm -r node_modules .npm
+
+install-data-hook:
+	test -d \$(DESTDIR)\${wwwdir} || mkdir -p \$(DESTDIR)\${wwwdir}
+	chmod -R u+w \$(DESTDIR)\${wwwdir}
+	cp -r . \$(DESTDIR)\${wwwdir}
+
+uninstall-local:
+	-chmod -R u+w \$(DESTDIR)\${wwwdir}
+	-rm -rf \$(DESTDIR)\${wwwdir}
+EOF2
+fi)
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
@@ -1490,7 +1625,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
@@ -1498,7 +1633,7 @@ EOF2
 EOF
     to debian/docs <<EOF
 NEWS
-README
+$README
 EOF
     to --condition AX_USE_LIBTOOL debian/${PACKAGE_NAME}.install <<EOF
 usr/lib/lib*.so.*
@@ -1533,71 +1668,64 @@ to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
 Version: @VERSION@
-Release: @BUILD_NUMBER@%{?dist}
+Release: @BUILD_NUMBER@.@DISTRO@
 License: LGPL
 Group: $(if testtag AX_USE_LIBTOOL; then
   echo Development/Libraries/C++;
 else
-  echo Applications/...;
+  echo @RPM_GROUP@;
 fi)
+$(if testtag AX_RPM_DEPEND; then echo "Requires: @RPM_DEPEND@"; fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, ${VCSDEPENDS_RPM} make, automake, autoconf, rpm-build$(
+BuildRequires: which, pkgconfig, pandoc, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
-    if testtag AX_USE_LIBTOOL; then
-      echo -n ", libtool";
+    if testtag AX_USE_CPPUNIT; then
+      echo -n ", cppunit-devel"
     fi
     if testtag AX_USE_DOXYGEN; then
-      echo -n ", doxygen, java-openjdk";
+      echo -n ", doxygen, graphviz, java-openjdk";
     fi
     if testtag AX_USE_PERLDOC; then
       echo -n ", libpod-tree-perl";
     fi
-)
-%if 0%{?fedora} != 20
-$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
+)  @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
+
+#### os dependent definitions ####
+%if 0%{?suse_version} || 0%{?sles_version}
+BuildRequires: lsb-release$(
+    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
+      echo -n ", libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel";
+    fi)
+%else
+$(
+    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
+      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
+    fi)
+%if  0%{?mageia}
+BuildRequires: rpm-sign, lsb-release
+%else
+BuildRequires: rpm-sign, redhat-lsb
+%global debug_package %{nil}
 %endif
-%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
-BuildRequires: which, pkgconfig$(
-    if testtag AX_USE_LIBTOOL; then
-      echo -n ", cppunit-devel"
-    fi
-)
-%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia}
-BuildRequires: rpm-sign
 %endif
-%if 0%{?mageia}
-BuildRequires: gnupg, lsb-release$(
-    if testtag AX_USE_LIBTOOL; then
-      echo -n ", libltdl-devel"
-    fi
-)
-%else
-BuildRequires: gpg, redhat-lsb$(
-    if testtag AX_USE_LIBTOOL; then
-      echo -n ", libtool-ltdl-devel"
-    fi
-)
+$(
+    if testtag AX_USE_DOXYGEN; then cat <<EOS
+%if ! 0%{?centos}
+BuildRequires: mscgen
 %endif
-%if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
-$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
+EOS
+    fi
+    if testtag AX_USE_LIBTOOL; then cat <<EOS
+%if 0%{?mageia}
+BuildRequires: libtool, libltdl-devel
 %else
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt-devel"; fi)
+BuildRequires: libtool, libtool-ltdl-devel
 %endif
-%else%if 0%{?suse_version} || 0%{?sles_version}
-BuildRequires: pkg-config, lsb-release$(
-    if testtag AX_USE_CPPUNIT; then
-      echo -n ", libcppunit-devel";
+EOS
     fi)
-%if 0%{?suse_version} < 1200 ||  0%{?sles_version} < 1200
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt4-devel, qt4-x11-tools, libQtWebKit-devel"; fi)
-%else
-$(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel"; fi)
-%endif
-%endif%endif
 
 %description
 @README@
@@ -1628,32 +1756,29 @@ rm -rf \$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 $(if testtag AX_USE_LIBTOOL; then
-echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
+echo '/usr/%_lib/*.so.*'
 else
-echo '/usr/bin/*'
-echo '/usr/share/applications/*'
+echo '/usr/bin'
+echo '/usr/share/applications'
 fi)
 /usr/share/@PACKAGE_NAME@
-%doc
-$(if testtag AX_USE_LIBTOOL; then
-  cat <<EOF2
-/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
-/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
-/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
-/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
-/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
-/usr/share/doc/packages/@PACKAGE_NAME@/README
+$(if testtag AX_USE_ETC; then
+
+cat <<EOF2
+%config
+/etc/*
+
 EOF2
-else
-  echo '/usr/share/doc/packages/@PACKAGE_NAME@'
 fi)
+%doc
+/usr/share/doc
 
 $(if testtag AX_USE_LIBTOOL; then
 cat <<EOF2
 %package devel
 Summary: @DESCRIPTION@
 Group: Development/Libraries/C++
-Requires: @PACKAGE_NAME@ = @VERSION@
+Requires: @PACKAGE_NAME@ = @VERSION@ @RPM_BUILD_DEPEND@
 
 %description devel
 @README@
@@ -1662,14 +1787,18 @@ This Package contains all files required for developement.
 
 %files devel
 %defattr(-,root,root,-)
-/usr/%_lib/@PACKAGE_NAME@.so
-/usr/%_lib/@PACKAGE_NAME@.a
-/usr/%_lib/@PACKAGE_NAME@.la
+/usr/%_lib/*.so
+/usr/%_lib/*.a
+/usr/%_lib/*.la
 /usr/%_lib/pkgconfig
 /usr/include/*
 %doc
-/usr/share/@PACKAGE_NAME@
-/usr/share/doc/packages/@PACKAGE_NAME@/html
+$(if testtag AX_USE_DOXYGEN AX_USE_PERLDOC; then
+  echo '/usr/share/doc/packages/@PACKAGE_NAME@/html'
+fi)
+$(if testtag AX_BUILD_EXAMPLES; then
+  echo '/usr/share/doc/packages/@PACKAGE_NAME@/examples'
+fi)
 EOF2
 fi)
 
@@ -1680,6 +1809,9 @@ SUBDIRS=""
 if testtag AX_USE_CXX; then
     SUBDIRS="${SUBDIRS} src"
 fi
+if testtag AX_USE_ETC; then
+    SUBDIRS="${SUBDIRS} etc"
+fi
 if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
     SUBDIRS="${SUBDIRS} test"
 fi
@@ -1709,7 +1841,18 @@ $(case "$VCS" in
 esac)
 fi
 aclocal
-$(if testtag AX_USE_LIBTOOL; then echo libtoolize --force; fi)
+$(if testtag AX_USE_LIBTOOL; then
+cat <<EOF1
+if which libtoolize > /dev/null; then
+  run libtoolize --force;
+elif which glibtoolize > /dev/null; then
+  run glibtoolize --force;
+else
+  echo "error: libtoolize not found" 1>&2
+  exit 1
+fi
+EOF1
+fi)
 automake -a
 autoconf
 EOF
@@ -1718,15 +1861,24 @@ ${HEADER}SUBDIRS =${SUBDIRS}
 
 desktopdir = \${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh		\\
-                    resolve-rpmbuilddeps.sh autogen.sh			\\
+dist_pkgdata_DATA = @PACKAGE_ICON@
+dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\\
+                   resolve-rpmbuilddeps.sh autogen.sh			\\
                     ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
                     build-resource-file.sh				\\
                     ax_init_standard_project.m4				\\
                     mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\
+                    dependency-graph.sh template.sh                     \\
                     sql-to-dot.sed
-dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_doc_DATA = AUTHORS NEWS $README COPYING INSTALL ChangeLog
+$(if test -e README.md -a ! -e README; then
+cat <<EOF2
 
+README: README.md
+
+CLEANFILES = README
+EOF2
+fi)
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF
@@ -1745,39 +1897,49 @@ Requires: @PKG_REQUIREMENTS@
 EOF
 to build-in-docker.conf <<EOF
 ${HEADER}# Use Ubuntu Universe Repository
-repos+=("Ubuntu:::universe")
-
-# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
-repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
-repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
-repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
-repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
-keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
+repos+=("ubuntu:::universe")
+
+# Use Marc Wäckerlin's Repository, see https://repository.mrw.sh
+repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
+keys+=("https://repository.mrw.sh/PublicKey")
+
+# centos requires epel-release for some packages, such as Qt WebKit
+packages+=("centos:::epel-release")
 EOF
 
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then
-    run --no-check make distclean
-fi
-
-#### Bootstrap Before Configure ####
-run --no-check vcs2cl
-run aclocal
-if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
-run automake -a
-run autoconf
-
-#### Run Configure If User Requires ####
-if test "$configure" -eq 1; then
-    ./configure $* || exit 1
-fi
-
-#### Run Make If User Requires ####
-if test "$build" -eq 1; then
-    make $buildtarget || exit 1
+    run --no-check make maintainer-clean
 fi
 
 #### Build In Docker If User Requires ####
 if test "$docker" -eq 1; then
-    ./build-in-docker.sh || exit 1
+    ./build-in-docker.sh $buildtarget $* || exit 1
+else
+    
+    #### Bootstrap Before Configure ####
+    run --no-check vcs2cl
+    run aclocal
+    if testtag AX_USE_LIBTOOL; then
+        if which libtoolize > /dev/null; then
+            run libtoolize --force;
+        elif which glibtoolize > /dev/null; then
+            run glibtoolize --force;
+        else
+            error libtoolize not found
+        fi
+    fi
+    run automake -a
+    run autoconf
+    
+    #### Run Configure If User Requires ####
+    if test "$configure" -eq 1; then
+        ./configure $* || exit 1
+    fi
+    
+    #### Run Make If User Requires ####
+    if test "$build" -eq 1; then
+        make $buildtarget || exit 1
+    fi
+    
 fi
diff --git a/build-in-docker.sh b/build-in-docker.sh
index d426c9e..5559f63 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -7,9 +7,10 @@ if test "${arch}" = "amd64"; then
     myarch="amd64|i386"
 fi
 mode="deb"
-img="ubuntu:latest"
+img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
+dns=()
 envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
@@ -41,6 +42,7 @@ while test $# -gt 0; do
             echo "  -f, --flag <flag>     add flag to ./bootstrap.sh or ./configure"
             echo "  -r, --repo <url>      add given apt repository"
             echo "  -k, --key <url>       add public key from url"
+            echo "  -n, --dns <ip>        add ip as dns server"
             echo "  -e, --env <var>=<val> set environment variable in docker"
             echo "  -d, --dir <dir>       access given directory read only"
             echo "  -p, --package <pkg>   install extra debian packages"
@@ -73,8 +75,8 @@ while test $# -gt 0; do
             echo "                     -e ANDROID_HOME=/opt/local/android \\"
             echo "                     -d /opt/local/android \\"
             echo "                     -r universe \\"
-            echo "                     -r https://dev.marc.waeckerlin.org/repository \\"
-            echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\"
+            echo "                     -r https://repository.mrw.sh \\"
+            echo "                     -k https://repository.mrw.sh/PublicKey \\"
             echo "                     -p mrw-c++"
             echo
             exit 0
@@ -82,11 +84,16 @@ while test $# -gt 0; do
         (-m|--mode) shift;
             mode="$1"
             case "$mode" in
-                (deb|apt) img="ubuntu:latest";;
+                (deb|apt) img="mwaeckerlin/ubuntu:latest";;
                 (rpm|zypper) img="opensuse:latest";;
                 (yum) img="centos:latest";;
                 (dnf) img="fedora:latest";;
-                (win) img="ubuntu:latest"; host="${host:---host=i686-w64-mingw32}";;
+                (win)
+                    img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
+                    targets="all install"
+                    flags+=("--prefix=/workdir/usr")
+                    packages+=("mingw-w64")
+                    ;;
                 (*)
                     echo "**** ERROR: unknown mode '$1', try --help" 1>&2
                     exit 1
@@ -123,6 +130,9 @@ while test $# -gt 0; do
         (-e|--env) shift;
             envs+=("-e $1")
             ;;
+        (-n|--dns) shift;
+            dns+=("--dns $1")
+            ;;
         (-d|--dirs) shift;
             dirs+=("-v $1:$1:ro")
             ;;
@@ -167,7 +177,8 @@ function traperror() {
                 echo
             fi
             if [ "$wait" -eq 1 ]; then
-                echo "  ... now you can access the docker container:"
+                echo "  ... now you can access the docker container as root or user:"
+                echo "      docker exec -it ${DOCKER_ID} bash"
                 echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
                 echo -n "  ... press enter to cleanup: "
                 read
@@ -180,13 +191,7 @@ function traperror() {
             exit $e
         fi
     done
-    if [ "$wait" -eq 1 ]; then
-        echo "  ... now you can access the docker container:"
-        echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
-        echo -n "  ... press enter to cleanup: "
-        read
-    fi
-    echo -n "   SUCCESS ... cleanup docker: "
+    echo -n "SUCCESS ... cleanup docker: "
     docker rm -f "${DOCKER_ID}"
     exit 0
 }
@@ -195,21 +200,27 @@ function ifthenelse() {
     arg="$1"
     shift
     cmd="$*"
+    DISTRIBUTOR=$(docker exec ${DOCKER_ID} lsb_release -si | sed 's, .*,,' | tr [:upper:] [:lower:])
+    CODENAME=$(docker exec ${DOCKER_ID} lsb_release -cs)
+    ARCH=$((docker exec ${DOCKER_ID} which dpkg > /dev/null 2> /dev/null && docker exec ${DOCKER_ID} dpkg --print-architecture) || echo amd64)
     if test "${arg/:::/}" = "${arg}"; then
-        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}"
+        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
     else
         os="${arg%%:::*}"
         thenpart="${arg#*:::}"
-        if test "${thenpart/:::/}" = "${thenpart}"; then
-            docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
-        else
+        elsepart=
+        if test "${thenpart/:::/}" != "${thenpart}"; then
             elsepart="${thenpart##*:::}"
-            thenpart="${thenpart%:::*}"
+            thenpart="${thenpart%%:::*}"
+        fi
+        if [[ "${DISTRIBUTOR}-${CODENAME}-${ARCH}" =~ ${os} ]]; then
             if test -n "${thenpart}"; then
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
-            else
-                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$((which dpkg > /dev/null 2> /dev/null && dpkg --print-architecture) || echo amd64)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
-            fi    
+                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${thenpart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+            fi
+        else
+            if test -n "${elsepart}"; then
+                docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${elsepart//@DISTRIBUTOR@/${DISTRIBUTOR}}}"
+            fi
         fi
     fi
 }
@@ -217,7 +228,7 @@ function ifthenelse() {
 set -x
 
 docker pull $img
-DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
 if ! [[ $arch =~ $myarch ]]; then
     docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
@@ -231,7 +242,7 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
 fi
 docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
 case $mode in
-    (deb|apt)
+    (deb|apt|win)
         if [[ "${img}" =~ "ubuntu" ]]; then
             docker exec ${DOCKER_ID} locale-gen ${LANG}
             docker exec ${DOCKER_ID} update-locale LANG=${LANG}
@@ -244,16 +255,16 @@ case $mode in
         done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
-        for repo in "${repos[@]}"; do
-            ifthenelse "${repo}" "apt-add-repository 'ARG'"
-        done
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release wget;
         for key in "${keys[@]}"; do
             wget -O- "$key" \
                 | docker exec -i ${DOCKER_ID} apt-key add -
         done
+        for repo in "${repos[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository 'ARG'"
+        done
         docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
         for package in "${packages[@]}"; do
             ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
@@ -277,7 +288,12 @@ gpgcheck=0
 EOF
         fi
         INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
-        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget /usr/bin/lsb_release
+        if test "$INSTALL_TOOL" = "urpmi --auto"; then
+            LSB_RELEASE=lsb-release
+        else
+            LSB_RELEASE=/usr/bin/lsb_release
+        fi
+        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget $LSB_RELEASE
         i=0
         for key in "${keys[@]}"; do
             wget -Orpm-key "$key"
@@ -285,20 +301,22 @@ EOF
             rm rpm-key
         done
         for repo in "${repos[@]}"; do
-            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
+            INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
             ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
             ((++i))
         done
+        for package in "${packages[@]}"; do
+            ifthenelse "${package}" "${INSTALL_TOOL} ARG"
+        done
+        for command in "${commands[@]}"; do
+            ifthenelse "${command}" "ARG"
+        done
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
         ;;
-    (win)
-        if [[ "${img}" =~ "ubuntu" ]]; then
-            docker exec ${DOCKER_ID} locale-gen ${LANG}
-            docker exec ${DOCKER_ID} update-locale LANG=${LANG}
-        fi
-        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install -y mingw-w64
-        docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
-        ;;
 esac
-docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} ${flags[@]}
+FLAGS=()
+for f in "${flags[@]}"; do
+    FLAGS+=($(ifthenelse "$f" "echo 'ARG'"))
+done
+          
+docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
diff --git a/configure.ac b/configure.ac
index 0f7a2a8..a1c8331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,4 +38,4 @@ AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS
 
 # create output
-AC_OUTPUT
+AX_OUTPUT
diff --git a/dependency-graph.sh b/dependency-graph.sh
new file mode 100755
index 0000000..e7b77bc
--- /dev/null
+++ b/dependency-graph.sh
@@ -0,0 +1,171 @@
+#!/bin/bash -e
+
+# template for bash scripts
+
+# internal use only
+append_msg() {
+    if test $# -ne 0; then
+        echo -en ":\e[0m \e[1m$*"
+    fi
+    echo -e "\e[0m"
+}
+
+# write a notice
+notice() {
+    if test $# -eq 0; then
+        return
+    fi
+    echo -e "\e[1m$*\e[0m" 1>&3
+}
+
+# write error message
+error() {
+    echo -en "\e[1;31merror" 1>&2
+    append_msg $* 1>&2
+}
+
+# write a warning message
+warning() {
+    echo -en "\e[1;33mwarning" 1>&2
+    append_msg $* 1>&2
+}
+
+# write a success message
+success() {
+    echo -en "\e[1;32msuccess" 1>&2
+    append_msg $* 1>&2
+}
+
+# commandline parameter evaluation
+files=${0%/*}/configure.ac
+short=0
+while test $# -gt 0; do
+    case "$1" in
+        (--short|-s) short=1;;
+        (--help|-h) less <<EOF
+SYNOPSIS
+
+  $0 [OPTIONS] <files>
+
+OPTIONS
+
+  --help, -h                 show this help
+  --short, -s                short graph with no external dependencies
+
+  <files>                    list of zero or more configure.ac files
+                             (default: ${files})
+
+DESCRIPTION
+
+  Evaluates dependencies of all the given configure.ac file. By
+  default takes the local configure.ac. Outputs a graphwiz dot file
+  with the dependencies. Solid lines are required dependencies, dotted
+  lines are optional dependencies.
+
+EXAMPLE
+
+  Evaluate all dependencies between all local subversion and git
+  projects, if they are in the path ~/svn and ~/git:
+
+    $0 ~/svn/*/configure.ac ~/git/*/configure.ac 
+
+EOF
+            exit;;
+        (*) files=$*; break;;
+    esac
+    if test $# -eq 0; then
+        error "missing parameter, try $0 --help"; exit 1
+    fi
+    shift;
+done
+
+# run a command, print the result and abort in case of error
+# option: --no-check: ignore the result, continue in case of error
+run() {
+    check=1
+    while test $# -gt 0; do
+        case "$1" in
+            (--no-check) check=0;;
+            (*) break;;
+        esac
+        shift;
+    done
+    echo -en "\e[1m-> running:\e[0m $* ..."
+    result=$($* 2>&1)
+    res=$?
+    if test $res -ne 0; then
+        if test $check -eq 1; then
+            error "failed with return code: $res"
+            if test -n "$result"; then
+                echo "$result"
+            fi
+            exit 1
+        else
+            warning "ignored return code: $res"
+        fi
+    else
+        success
+    fi
+}
+
+# error handler
+function traperror() {
+    set +x
+    local err=($1) # error status
+    local line="$2" # LINENO
+    local linecallfunc="$3"
+    local command="$4"
+    local funcstack="$5"
+    for e in ${err[@]}; do
+        if test -n "$e" -a "$e" != "0"; then
+            error "line $line - command '$command' exited with status: $e (${err[@]})"
+            if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then
+                echo -n "   ... error at ${funcstack} "
+                if [ "$linecallfunc" != "" ]; then
+                    echo -n "called at line $linecallfunc"
+                fi
+                echo
+            fi
+            exit $e
+        fi
+    done
+    success
+    exit 0
+}
+
+# catch errors
+trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT
+
+##########################################################################################
+
+filter() {
+    if test $short -eq 1; then
+        all=$(cat)
+        allowed=$(sed -n '/"\(.*\)" \[style=solid\];/{s//\1/;H};${x;s/\n//;s/\n/\\|/gp}' <<<"${all}")
+        sed -n '/"\('"${allowed}"'\)" -> "\('"${allowed}"'\)"/p' <<<"${all}"
+    else
+        cat
+    fi
+}
+
+echo "digraph G {"
+if test $short -eq 0; then
+    echo "node [style=dashed];"
+fi
+(
+    for file in $files; do
+        if ! test -e $file; then
+            error "file $file not found"; exit 1
+        fi
+        sed -n '
+      /^ *m4_define(x_package_name, */ {s//"/;s/ *).*/"/;h;s/.*/& [style=solid];/p}
+      /^ *AX_REQUIRE_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/&;/p}
+      /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/&;/p}
+      /^ *AX_PKG_REQUIRE(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/&;/p}
+      /^ *AX_CHECK_QT/ {s/.*/"qt" -> /;G;s/\n//;s/.*/& [style=dashed];/p}
+      /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?, \[\?\([^],)]\+\)\]\?.*/ {s//"\2" -> /;G;s/\n//;s/.*/& [style=dotted];/p}
+      /^ *AX_PKG_CHECK(\[\?\([^],)]\+\)\]\?.*/ {s//"\1" -> /;G;s/\n//;s/.*/& [style=dotted];/p}
+    ' $file
+    done
+) | filter
+echo "}"
diff --git a/mac-create-app-bundle.sh b/mac-create-app-bundle.sh
index d1f41a6..1b8f511 100755
--- a/mac-create-app-bundle.sh
+++ b/mac-create-app-bundle.sh
@@ -38,6 +38,7 @@ executablefile=$(ls -1 ${1}/Contents/MacOS/ | head -1)
 ! test -d ${3}/share || rmdir ${3}/share
 ! test -d ${3} || \
     find ${3} -mindepth 1 -maxdepth 1 -exec mv {} ${1}/Contents/Resources/ \;
+! test -d ${3}/include || rm -r ${3}/include
 ! test -d ${3} || rmdir ${3}
 ! test -d ${1}/tmp || rm -r ${1}/tmp
 
diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh
index 30b0a5d..36a94e6 100755
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@@ -35,24 +35,73 @@ TO_INSTALL=
 DEPS=
 
 if test -e debian/control.in -a ! -e debian/control; then
-    for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
-        if test -n "$(${DO} apt-cache policy -q ${f})" && ((! $(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
+    function pkg_exists() {
+        test -n "$(${DO} apt-cache policy -q ${1})"
+    }
+    function AX_PKG_CHECK() {
+        local DEV_DEB_DIST_PKG=
+        local DEV_DIST_PKG=
+        local pkg=
+        eval $4
+        if test -z "$2"; then
+            pkg=$1
+        else
+            pkg=$2
+        fi
+        pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
+        if pkg_exists "${pkg}"; then
+            echo $pkg
+        fi
+    }
+    function AX_PKG_REQUIRE() {
+        local DEV_DEB_DIST_PKG=
+        local DEV_DIST_PKG=
+        local pkg=
+        eval $6
+        if test -z "$2"; then
+            pkg=$1
+        else
+            pkg=$2
+        fi
+        if test -n "$4"; then
+            for f in $pkg $4; do
+                if pkg_exists "${f}-dev"; then
+                    pkg=$f
+                    break
+                fi
+            done
+        fi
+        echo ${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
+    }
+    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
+    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
+    for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,p' configure.ac); do
+        if pkg_exists "${f}"; then
             DEPS+=" ${f}"
         fi
     done
-    for f in $(sed -n 's, *AX_DEB_BUILD_DEPEND(\([^)]*\)).*,\1,p' configure.ac); do
+    for f in $(sed -n 's, *AX_\(DEB\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do
+        if pkg_exists "${f}-dev"; then
+            DEPS+=" ${f}-dev"
+        fi
+    done
+    for f in $(sed -n 's, *AX_\(DEB\|ALL\)\(_BUILD\)\?_DEPEND(\([^)]*\)).*,\3,p' configure.ac); do
         DEPS+=" ${f}"
     done
+    for f in $(sed -n 's, *AX_\(DEB\|ALL\)\(_BUILD\)\?_DEPEND_DEV(\([^)]*\)).*,\3,p' configure.ac); do
+        DEPS+=" ${f}-dev"
+    done
     trap "rm debian/control" INT TERM EXIT
-    sed 's,@\(DEB_DEPEND_IFEXISTS\|DEB_BUILD_DEPEND\|DEB_DEPEND\)@,,g' debian/control.in | \
+    sed 's,@\(\(ALL\|DEB\)_DEPEND_IFEXISTS\|\(ALL\|DEB\)_BUILD_DEPEND\|\(ALL\|DEB\)_DEPEND\)@,,g' debian/control.in | \
         sed 's,@[^@]*@, dummytext,g' > debian/control
 fi
 
 install dpkg-dev
+
 DEPS+=" $(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')"
 
 for pa in ${DEPS}; do
-    if test ${pa//|/} = ${pa}; then
+    if test "${pa//|/}" = "${pa}"; then
         TO_INSTALL+=" ${pa}"
         continue;
     fi
@@ -75,4 +124,10 @@ if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then
     exit 1
 fi
 
+FILES="$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')"
+if test -n "${FILES}"; then
+    echo "**** ERROR: Cannot install: " $FILES
+    exit 1
+fi
+
 echo "**** Success: All Dependencies Resolved"
diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh
index 1ed2408..7c1843b 100755
--- a/resolve-rpmbuilddeps.sh
+++ b/resolve-rpmbuilddeps.sh
@@ -14,12 +14,78 @@ INSTALL_TOOL=${INSTALL_TOOL:-$((test -x /usr/bin/zypper && echo zypper install -
 SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
 
-TRAP_CMD=
+TRAP_CMD="sleep ${SLEEP:-0};"
+DEPS=
+for f in BUILD BUILDROOT RPMS SPECS SRPMS; do
+  if ! test -d $f; then
+      TRAP_CMD+="rm -rf $f;"
+      mkdir $f
+  fi
+done
 if test -e ${PACKAGE_NAME}.spec.in -a ! -e ${PACKAGE_NAME}.spec; then
+    function pkg_exists() {
+        (test -x /usr/bin/zypper && zypper search -x "$1" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/dnf && dnf list -q "$1" 1>&2 > /dev/null) || \
+            (test -x /usr/bin/yum && yum list -q "$1" 1>&2 > /dev/null) || \
+            (test -x /usr/sbin/urpmq && urpmq "$1" 1>&2 > /dev/null)
+    }
+    function AX_PKG_CHECK() {
+        local DEV_RPM_DIST_PKG=
+        local DEV_DIST_PKG=
+        local pkg=
+        eval $4
+        if test -z "$2"; then
+            pkg=$1
+        else
+            pkg=$2
+        fi
+        pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
+        if pkg_exists "${pkg}"; then
+            echo ${pkg}
+        fi
+    }
+    function AX_PKG_REQUIRE() {
+        local DEV_RPM_DIST_PKG=
+        local DEV_DIST_PKG=
+        local pkg=
+        eval $6
+        if test -z "$2"; then
+            pkg=$1
+        else
+            pkg=$2
+        fi
+        if test -n "$4"; then
+            for f in $pkg $4; do
+                if pkg_exists "${f}-devel"; then
+                    pkg=$f
+                    break
+                fi
+            done
+        fi
+        echo ${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
+    }
+    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_REQUIRE/{s,^ *\(AX_PKG_REQUIRE\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
+    DEPS+=" $(eval $(sed -n '/^ *AX_PKG_CHECK/{s,^ *\(AX_PKG_CHECK\) *(\(.*\)).*,\1 \2,;s.\[\([^]]*\)\],\?."\1".g;s,$,;,g;p}' configure.ac))"
+    for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS(\([^)]*\)).*,\2,p' configure.ac); do
+        if pkg_exists "${f}"; then
+            DEPS+=" ${f}"
+        fi
+    done
+    for f in $(sed -n 's, *AX_\(RPM\|ALL\)_DEPEND_IFEXISTS_DEV(\([^)]*\)).*,\2,p' configure.ac); do
+        if pkg_exists "${f}-devel"; then
+            DEPS+=" ${f}-devel"
+        fi
+    done
+    for f in $(sed -n 's, *AX_\(RPM\|ALL\)\(_BUILD\)\?_DEPEND(\([^)]*\)).*,\3,p' configure.ac); do
+        DEPS+=" ${f}"
+    done
+    for f in $(sed -n 's, *AX_\(RPM\|ALL\)\(_BUILD\)\?_DEPEND_DEV(\([^)]*\)).*,\3,p' configure.ac); do
+        DEPS+=" ${f}-devel"
+    done
     TRAP_CMD+="rm ${PACKAGE_NAME}.spec;"
     trap "${TRAP_CMD}" INT TERM EXIT
-    sed 's,@RPM_DEPEND_IFEXISTS@,,g' ${PACKAGE_NAME}.spec.in | \
-        sed 's,@[^@]*@, dummytext,g' > ${PACKAGE_NAME}.spec
+    sed 's,@\(\(ALL\|RPM\)_DEPEND_IFEXISTS\|\(ALL\|RPM\)_BUILD_DEPEND\|\(ALL\|RPM\)_DEPEND\)@,,g' ${PACKAGE_NAME}.spec.in | \
+        sed 's,@[^@]*@,dummytext,g' > ${PACKAGE_NAME}.spec
 fi
 
 TGZFILE=$(sed -n '/^Name: */{s///;h};/^Version: */{s///;H;x;s/\n/-/;s/$/.tar.gz/;p}' ${PACKAGE_NAME}.spec)
@@ -32,13 +98,23 @@ fi
 if test -n "${SCHROOTNAME}"; then
     FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
-        schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES}
+        schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES} ${DEPS}
     fi
 else
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
-        ${INSTALL_TOOL} ${FILES}
+        ${INSTALL_TOOL} ${FILES} ${DEPS}
     fi
 fi
 
+if test -n "${SCHROOTNAME}"; then
+    FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
+else
+    FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
+fi
+if test -n "${FILES}"; then
+    echo "**** ERROR: Cannot install: " $FILES
+    exit 1
+fi
+
 echo "**** Success: All Dependencies Resolved"
diff --git a/rpmsign.exp b/rpmsign.exp
new file mode 100755
index 0000000..dc29d94
--- /dev/null
+++ b/rpmsign.exp
@@ -0,0 +1,14 @@
+#!/usr/bin/expect -f
+
+set key [lindex $argv 0]
+set password [lindex $argv 1]
+set files [lrange $argv 2 end]
+
+### rpm-sign.exp -- Sign RPMs by sending the passphrase.
+spawn rpmsign --define "_gpg_name $key" --addsign {*}$files
+expect {
+    "Enter pass phrase: " {
+        send -- "$password\r"
+        exp_continue
+    } eof
+}
diff --git a/src/tokentool_de.ts b/src/tokentool_de.ts
index aa394f0..4019f9a 100644
--- a/src/tokentool_de.ts
+++ b/src/tokentool_de.ts
@@ -4,13 +4,13 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="39"/>
+        <location filename="main.cxx" line="35"/>
         <source>tokentool</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="53"/>
+        <location filename="main.cxx" line="49"/>
         <source>Usage: %1 [OPTIONS...]
 Options:
  -h, --help        show this help text
@@ -20,7 +20,7 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="64"/>
+        <location filename="main.cxx" line="60"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>
@@ -29,418 +29,449 @@ Try: %1 --help</source>
 <context>
     <name>tokentool</name>
     <message>
-        <location filename="tokentool.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="tokentool.ui" line="115"/>
+        <location filename="tokentool.ui" line="119"/>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="125"/>
+        <location filename="tokentool.ui" line="129"/>
         <source>PKCS#11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="280"/>
+        <location filename="tokentool.ui" line="284"/>
         <source>Slot Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="294"/>
+        <location filename="tokentool.ui" line="298"/>
         <source>Slot Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="352"/>
-        <location filename="tokentool.ui" line="755"/>
+        <location filename="tokentool.ui" line="356"/>
+        <location filename="tokentool.ui" line="759"/>
         <source>Hardware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="381"/>
-        <location filename="tokentool.ui" line="781"/>
+        <location filename="tokentool.ui" line="385"/>
+        <location filename="tokentool.ui" line="785"/>
         <source>Firmware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="425"/>
+        <location filename="tokentool.ui" line="429"/>
         <source>Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="443"/>
+        <location filename="tokentool.ui" line="447"/>
         <source>Token Present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="462"/>
+        <location filename="tokentool.ui" line="466"/>
         <source>Removable Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="481"/>
+        <location filename="tokentool.ui" line="485"/>
         <source>Hardware Slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="139"/>
+        <location filename="tokentool.ui" line="143"/>
         <source>Cryptoki Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="85"/>
+        <location filename="tokentool.ui" line="14"/>
+        <source>Tokentool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="89"/>
         <source>Objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="191"/>
+        <location filename="tokentool.ui" line="195"/>
         <source>Library Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="217"/>
+        <location filename="tokentool.ui" line="221"/>
         <source>Library Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="237"/>
+        <location filename="tokentool.ui" line="241"/>
         <source>Driver-Library:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="505"/>
+        <location filename="tokentool.ui" line="509"/>
         <source>Token Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="521"/>
+        <location filename="tokentool.ui" line="525"/>
         <source>Label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="573"/>
+        <location filename="tokentool.ui" line="577"/>
         <source>Model:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="599"/>
+        <location filename="tokentool.ui" line="603"/>
         <source>Serial Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="625"/>
+        <location filename="tokentool.ui" line="629"/>
         <source>Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="651"/>
+        <location filename="tokentool.ui" line="655"/>
         <source>RW Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="677"/>
+        <location filename="tokentool.ui" line="681"/>
         <source>PIN Length:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="703"/>
+        <location filename="tokentool.ui" line="707"/>
         <source>Public Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="729"/>
+        <location filename="tokentool.ui" line="733"/>
         <source>Private Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="807"/>
+        <location filename="tokentool.ui" line="811"/>
         <source>UTC Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="858"/>
+        <location filename="tokentool.ui" line="862"/>
         <source>Token Info Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="874"/>
+        <location filename="tokentool.ui" line="878"/>
         <source>General Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="892"/>
+        <location filename="tokentool.ui" line="896"/>
         <source>Random Number Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="911"/>
+        <location filename="tokentool.ui" line="915"/>
         <source>Clock On Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="930"/>
+        <location filename="tokentool.ui" line="934"/>
         <source>Write Protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="949"/>
+        <location filename="tokentool.ui" line="953"/>
         <source>Protected Authentication Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="968"/>
+        <location filename="tokentool.ui" line="972"/>
         <source>Login Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="987"/>
+        <location filename="tokentool.ui" line="991"/>
         <source>Dual Crypto Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1006"/>
+        <location filename="tokentool.ui" line="1010"/>
         <source>User PIN Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1025"/>
+        <location filename="tokentool.ui" line="1029"/>
         <source>Token Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1044"/>
+        <location filename="tokentool.ui" line="1048"/>
         <source>Restore Key Not Needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1063"/>
+        <location filename="tokentool.ui" line="1067"/>
         <source>Secondary Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1079"/>
+        <location filename="tokentool.ui" line="1083"/>
         <source>User PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1097"/>
-        <location filename="tokentool.ui" line="1188"/>
+        <location filename="tokentool.ui" line="1101"/>
+        <location filename="tokentool.ui" line="1192"/>
         <source>Count Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1116"/>
-        <location filename="tokentool.ui" line="1207"/>
+        <location filename="tokentool.ui" line="1120"/>
+        <location filename="tokentool.ui" line="1211"/>
         <source>Final Try</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1135"/>
-        <location filename="tokentool.ui" line="1226"/>
+        <location filename="tokentool.ui" line="1139"/>
+        <location filename="tokentool.ui" line="1230"/>
         <source>Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1154"/>
-        <location filename="tokentool.ui" line="1245"/>
+        <location filename="tokentool.ui" line="1158"/>
+        <location filename="tokentool.ui" line="1249"/>
         <source>To Be Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1170"/>
+        <location filename="tokentool.ui" line="1174"/>
         <source>SO PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="68"/>
+        <location filename="tokentool.ui" line="1371"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="72"/>
         <source>PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1308"/>
+        <location filename="tokentool.ui" line="1312"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1314"/>
+        <location filename="tokentool.ui" line="1318"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1327"/>
+        <location filename="tokentool.ui" line="1326"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="1338"/>
         <source>Delete Selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1330"/>
+        <location filename="tokentool.ui" line="1341"/>
         <source>Delete selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1333"/>
+        <location filename="tokentool.ui" line="1344"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1338"/>
+        <location filename="tokentool.ui" line="1349"/>
         <source>Rescan Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1341"/>
+        <location filename="tokentool.ui" line="1352"/>
         <source>F5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1349"/>
+        <location filename="tokentool.ui" line="1360"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="165"/>
-        <location filename="tokentool.ui" line="323"/>
-        <location filename="tokentool.ui" line="547"/>
+        <location filename="tokentool.ui" line="169"/>
+        <location filename="tokentool.ui" line="327"/>
+        <location filename="tokentool.ui" line="551"/>
         <source>Manufacturer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="25"/>
+        <location filename="tokentool.ui" line="29"/>
         <source>Certificates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="53"/>
-        <location filename="tokentool.ui" line="101"/>
+        <location filename="tokentool.ui" line="57"/>
+        <location filename="tokentool.ui" line="105"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="58"/>
-        <location filename="tokentool.ui" line="106"/>
+        <location filename="tokentool.ui" line="62"/>
+        <location filename="tokentool.ui" line="110"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1303"/>
+        <location filename="tokentool.ui" line="1307"/>
         <source>Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="79"/>
+        <location filename="tokentool.hxx" line="82"/>
         <source>Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="80"/>
+        <location filename="tokentool.hxx" line="83"/>
         <source>SmardCard Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="304"/>
+        <location filename="tokentool.hxx" line="310"/>
         <source>Valid Since</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="308"/>
+        <location filename="tokentool.hxx" line="314"/>
         <source>Valid Until</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="312"/>
-        <source>Certificate Serial Number</source>
+        <location filename="tokentool.hxx" line="339"/>
+        <source>Subject Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="316"/>
-        <source>Subject Info</source>
+        <location filename="tokentool.hxx" line="330"/>
+        <source>Issuer Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="335"/>
-        <source>Issuer Info</source>
+        <location filename="tokentool.hxx" line="318"/>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>PIN required</source>
+        <location filename="tokentool.hxx" line="322"/>
+        <source>Digest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>Please enter PIN</source>
+        <location filename="tokentool.hxx" line="326"/>
+        <source>Serial Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Login Failed</source>
+        <location filename="tokentool.hxx" line="348"/>
+        <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Wrong PIN</source>
+        <location filename="tokentool.hxx" line="355"/>
+        <source>%1[%2]</source>
+        <comment>element of a certificate extension map; %1: extension name, %2: map entry name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="375"/>
-        <source>Delete Failed</source>
+        <location filename="tokentool.hxx" line="361"/>
+        <source>Public Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="376"/>
-        <source>Certificate Deletion Failes</source>
+        <location filename="tokentool.hxx" line="370"/>
+        <source>Algorithm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="430"/>
+        <source>[%1]</source>
+        <comment>stringified representation of nonprintable character; %1: value in hex</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="382"/>
-        <source>E-Mail</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>PIN required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="383"/>
-        <source>URL</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>Please enter PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="385"/>
-        <source>error</source>
-        <comment>unknown certificate subject alternate name</comment>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Login Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Wrong PIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="485"/>
+        <source>Delete Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="486"/>
+        <source>Certificate Deletion Failes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="391"/>
+        <location filename="tokentool.hxx" line="501"/>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="393"/>
+        <location filename="tokentool.hxx" line="503"/>
         <source>Common Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="395"/>
+        <location filename="tokentool.hxx" line="505"/>
         <source>Locality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="397"/>
+        <location filename="tokentool.hxx" line="507"/>
         <source>Organizational Unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="399"/>
+        <location filename="tokentool.hxx" line="509"/>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="401"/>
+        <location filename="tokentool.hxx" line="511"/>
         <source>State or Province</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="403"/>
+        <location filename="tokentool.hxx" line="513"/>
         <source>error</source>
         <comment>unknown certificate subject info</comment>
         <translation type="unfinished"></translation>
diff --git a/src/tokentool_en.ts b/src/tokentool_en.ts
index 6a41782..5225d99 100644
--- a/src/tokentool_en.ts
+++ b/src/tokentool_en.ts
@@ -4,13 +4,13 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="39"/>
+        <location filename="main.cxx" line="35"/>
         <source>tokentool</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="53"/>
+        <location filename="main.cxx" line="49"/>
         <source>Usage: %1 [OPTIONS...]
 Options:
  -h, --help        show this help text
@@ -20,7 +20,7 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="64"/>
+        <location filename="main.cxx" line="60"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>
@@ -29,418 +29,449 @@ Try: %1 --help</source>
 <context>
     <name>tokentool</name>
     <message>
-        <location filename="tokentool.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="tokentool.ui" line="115"/>
+        <location filename="tokentool.ui" line="119"/>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="125"/>
+        <location filename="tokentool.ui" line="129"/>
         <source>PKCS#11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="280"/>
+        <location filename="tokentool.ui" line="284"/>
         <source>Slot Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="294"/>
+        <location filename="tokentool.ui" line="298"/>
         <source>Slot Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="352"/>
-        <location filename="tokentool.ui" line="755"/>
+        <location filename="tokentool.ui" line="356"/>
+        <location filename="tokentool.ui" line="759"/>
         <source>Hardware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="381"/>
-        <location filename="tokentool.ui" line="781"/>
+        <location filename="tokentool.ui" line="385"/>
+        <location filename="tokentool.ui" line="785"/>
         <source>Firmware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="425"/>
+        <location filename="tokentool.ui" line="429"/>
         <source>Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="443"/>
+        <location filename="tokentool.ui" line="447"/>
         <source>Token Present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="462"/>
+        <location filename="tokentool.ui" line="466"/>
         <source>Removable Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="481"/>
+        <location filename="tokentool.ui" line="485"/>
         <source>Hardware Slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="139"/>
+        <location filename="tokentool.ui" line="143"/>
         <source>Cryptoki Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="85"/>
+        <location filename="tokentool.ui" line="14"/>
+        <source>Tokentool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="89"/>
         <source>Objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="191"/>
+        <location filename="tokentool.ui" line="195"/>
         <source>Library Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="217"/>
+        <location filename="tokentool.ui" line="221"/>
         <source>Library Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="237"/>
+        <location filename="tokentool.ui" line="241"/>
         <source>Driver-Library:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="505"/>
+        <location filename="tokentool.ui" line="509"/>
         <source>Token Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="521"/>
+        <location filename="tokentool.ui" line="525"/>
         <source>Label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="573"/>
+        <location filename="tokentool.ui" line="577"/>
         <source>Model:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="599"/>
+        <location filename="tokentool.ui" line="603"/>
         <source>Serial Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="625"/>
+        <location filename="tokentool.ui" line="629"/>
         <source>Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="651"/>
+        <location filename="tokentool.ui" line="655"/>
         <source>RW Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="677"/>
+        <location filename="tokentool.ui" line="681"/>
         <source>PIN Length:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="703"/>
+        <location filename="tokentool.ui" line="707"/>
         <source>Public Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="729"/>
+        <location filename="tokentool.ui" line="733"/>
         <source>Private Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="807"/>
+        <location filename="tokentool.ui" line="811"/>
         <source>UTC Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="858"/>
+        <location filename="tokentool.ui" line="862"/>
         <source>Token Info Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="874"/>
+        <location filename="tokentool.ui" line="878"/>
         <source>General Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="892"/>
+        <location filename="tokentool.ui" line="896"/>
         <source>Random Number Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="911"/>
+        <location filename="tokentool.ui" line="915"/>
         <source>Clock On Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="930"/>
+        <location filename="tokentool.ui" line="934"/>
         <source>Write Protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="949"/>
+        <location filename="tokentool.ui" line="953"/>
         <source>Protected Authentication Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="968"/>
+        <location filename="tokentool.ui" line="972"/>
         <source>Login Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="987"/>
+        <location filename="tokentool.ui" line="991"/>
         <source>Dual Crypto Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1006"/>
+        <location filename="tokentool.ui" line="1010"/>
         <source>User PIN Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1025"/>
+        <location filename="tokentool.ui" line="1029"/>
         <source>Token Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1044"/>
+        <location filename="tokentool.ui" line="1048"/>
         <source>Restore Key Not Needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1063"/>
+        <location filename="tokentool.ui" line="1067"/>
         <source>Secondary Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1079"/>
+        <location filename="tokentool.ui" line="1083"/>
         <source>User PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1097"/>
-        <location filename="tokentool.ui" line="1188"/>
+        <location filename="tokentool.ui" line="1101"/>
+        <location filename="tokentool.ui" line="1192"/>
         <source>Count Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1116"/>
-        <location filename="tokentool.ui" line="1207"/>
+        <location filename="tokentool.ui" line="1120"/>
+        <location filename="tokentool.ui" line="1211"/>
         <source>Final Try</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1135"/>
-        <location filename="tokentool.ui" line="1226"/>
+        <location filename="tokentool.ui" line="1139"/>
+        <location filename="tokentool.ui" line="1230"/>
         <source>Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1154"/>
-        <location filename="tokentool.ui" line="1245"/>
+        <location filename="tokentool.ui" line="1158"/>
+        <location filename="tokentool.ui" line="1249"/>
         <source>To Be Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1170"/>
+        <location filename="tokentool.ui" line="1174"/>
         <source>SO PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="68"/>
+        <location filename="tokentool.ui" line="1371"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="72"/>
         <source>PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1308"/>
+        <location filename="tokentool.ui" line="1312"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1314"/>
+        <location filename="tokentool.ui" line="1318"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1327"/>
+        <location filename="tokentool.ui" line="1326"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="1338"/>
         <source>Delete Selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1330"/>
+        <location filename="tokentool.ui" line="1341"/>
         <source>Delete selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1333"/>
+        <location filename="tokentool.ui" line="1344"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1338"/>
+        <location filename="tokentool.ui" line="1349"/>
         <source>Rescan Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1341"/>
+        <location filename="tokentool.ui" line="1352"/>
         <source>F5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1349"/>
+        <location filename="tokentool.ui" line="1360"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="165"/>
-        <location filename="tokentool.ui" line="323"/>
-        <location filename="tokentool.ui" line="547"/>
+        <location filename="tokentool.ui" line="169"/>
+        <location filename="tokentool.ui" line="327"/>
+        <location filename="tokentool.ui" line="551"/>
         <source>Manufacturer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="25"/>
+        <location filename="tokentool.ui" line="29"/>
         <source>Certificates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="53"/>
-        <location filename="tokentool.ui" line="101"/>
+        <location filename="tokentool.ui" line="57"/>
+        <location filename="tokentool.ui" line="105"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="58"/>
-        <location filename="tokentool.ui" line="106"/>
+        <location filename="tokentool.ui" line="62"/>
+        <location filename="tokentool.ui" line="110"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1303"/>
+        <location filename="tokentool.ui" line="1307"/>
         <source>Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="79"/>
+        <location filename="tokentool.hxx" line="82"/>
         <source>Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="80"/>
+        <location filename="tokentool.hxx" line="83"/>
         <source>SmardCard Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="304"/>
+        <location filename="tokentool.hxx" line="310"/>
         <source>Valid Since</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="308"/>
+        <location filename="tokentool.hxx" line="314"/>
         <source>Valid Until</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="312"/>
-        <source>Certificate Serial Number</source>
+        <location filename="tokentool.hxx" line="339"/>
+        <source>Subject Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="316"/>
-        <source>Subject Info</source>
+        <location filename="tokentool.hxx" line="330"/>
+        <source>Issuer Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="335"/>
-        <source>Issuer Info</source>
+        <location filename="tokentool.hxx" line="318"/>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>PIN required</source>
+        <location filename="tokentool.hxx" line="322"/>
+        <source>Digest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>Please enter PIN</source>
+        <location filename="tokentool.hxx" line="326"/>
+        <source>Serial Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Login Failed</source>
+        <location filename="tokentool.hxx" line="348"/>
+        <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Wrong PIN</source>
+        <location filename="tokentool.hxx" line="355"/>
+        <source>%1[%2]</source>
+        <comment>element of a certificate extension map; %1: extension name, %2: map entry name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="375"/>
-        <source>Delete Failed</source>
+        <location filename="tokentool.hxx" line="361"/>
+        <source>Public Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="376"/>
-        <source>Certificate Deletion Failes</source>
+        <location filename="tokentool.hxx" line="370"/>
+        <source>Algorithm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="430"/>
+        <source>[%1]</source>
+        <comment>stringified representation of nonprintable character; %1: value in hex</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="382"/>
-        <source>E-Mail</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>PIN required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="383"/>
-        <source>URL</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>Please enter PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="385"/>
-        <source>error</source>
-        <comment>unknown certificate subject alternate name</comment>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Login Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Wrong PIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="485"/>
+        <source>Delete Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="486"/>
+        <source>Certificate Deletion Failes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="391"/>
+        <location filename="tokentool.hxx" line="501"/>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="393"/>
+        <location filename="tokentool.hxx" line="503"/>
         <source>Common Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="395"/>
+        <location filename="tokentool.hxx" line="505"/>
         <source>Locality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="397"/>
+        <location filename="tokentool.hxx" line="507"/>
         <source>Organizational Unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="399"/>
+        <location filename="tokentool.hxx" line="509"/>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="401"/>
+        <location filename="tokentool.hxx" line="511"/>
         <source>State or Province</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="403"/>
+        <location filename="tokentool.hxx" line="513"/>
         <source>error</source>
         <comment>unknown certificate subject info</comment>
         <translation type="unfinished"></translation>
diff --git a/src/tokentool_fr.ts b/src/tokentool_fr.ts
index bcf2dde..8d1f0ab 100644
--- a/src/tokentool_fr.ts
+++ b/src/tokentool_fr.ts
@@ -4,13 +4,13 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="main.cxx" line="39"/>
+        <location filename="main.cxx" line="35"/>
         <source>tokentool</source>
         <comment>application name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="53"/>
+        <location filename="main.cxx" line="49"/>
         <source>Usage: %1 [OPTIONS...]
 Options:
  -h, --help        show this help text
@@ -20,7 +20,7 @@ Environment:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cxx" line="64"/>
+        <location filename="main.cxx" line="60"/>
         <source>Too few arguments.
 Try: %1 --help</source>
         <translation type="unfinished"></translation>
@@ -29,418 +29,449 @@ Try: %1 --help</source>
 <context>
     <name>tokentool</name>
     <message>
-        <location filename="tokentool.ui" line="14"/>
-        <source>MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="tokentool.ui" line="115"/>
+        <location filename="tokentool.ui" line="119"/>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="125"/>
+        <location filename="tokentool.ui" line="129"/>
         <source>PKCS#11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="280"/>
+        <location filename="tokentool.ui" line="284"/>
         <source>Slot Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="294"/>
+        <location filename="tokentool.ui" line="298"/>
         <source>Slot Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="352"/>
-        <location filename="tokentool.ui" line="755"/>
+        <location filename="tokentool.ui" line="356"/>
+        <location filename="tokentool.ui" line="759"/>
         <source>Hardware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="381"/>
-        <location filename="tokentool.ui" line="781"/>
+        <location filename="tokentool.ui" line="385"/>
+        <location filename="tokentool.ui" line="785"/>
         <source>Firmware Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="425"/>
+        <location filename="tokentool.ui" line="429"/>
         <source>Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="443"/>
+        <location filename="tokentool.ui" line="447"/>
         <source>Token Present</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="462"/>
+        <location filename="tokentool.ui" line="466"/>
         <source>Removable Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="481"/>
+        <location filename="tokentool.ui" line="485"/>
         <source>Hardware Slot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="139"/>
+        <location filename="tokentool.ui" line="143"/>
         <source>Cryptoki Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="85"/>
+        <location filename="tokentool.ui" line="14"/>
+        <source>Tokentool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="89"/>
         <source>Objects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="191"/>
+        <location filename="tokentool.ui" line="195"/>
         <source>Library Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="217"/>
+        <location filename="tokentool.ui" line="221"/>
         <source>Library Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="237"/>
+        <location filename="tokentool.ui" line="241"/>
         <source>Driver-Library:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="505"/>
+        <location filename="tokentool.ui" line="509"/>
         <source>Token Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="521"/>
+        <location filename="tokentool.ui" line="525"/>
         <source>Label:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="573"/>
+        <location filename="tokentool.ui" line="577"/>
         <source>Model:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="599"/>
+        <location filename="tokentool.ui" line="603"/>
         <source>Serial Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="625"/>
+        <location filename="tokentool.ui" line="629"/>
         <source>Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="651"/>
+        <location filename="tokentool.ui" line="655"/>
         <source>RW Session Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="677"/>
+        <location filename="tokentool.ui" line="681"/>
         <source>PIN Length:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="703"/>
+        <location filename="tokentool.ui" line="707"/>
         <source>Public Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="729"/>
+        <location filename="tokentool.ui" line="733"/>
         <source>Private Memory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="807"/>
+        <location filename="tokentool.ui" line="811"/>
         <source>UTC Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="858"/>
+        <location filename="tokentool.ui" line="862"/>
         <source>Token Info Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="874"/>
+        <location filename="tokentool.ui" line="878"/>
         <source>General Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="892"/>
+        <location filename="tokentool.ui" line="896"/>
         <source>Random Number Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="911"/>
+        <location filename="tokentool.ui" line="915"/>
         <source>Clock On Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="930"/>
+        <location filename="tokentool.ui" line="934"/>
         <source>Write Protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="949"/>
+        <location filename="tokentool.ui" line="953"/>
         <source>Protected Authentication Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="968"/>
+        <location filename="tokentool.ui" line="972"/>
         <source>Login Required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="987"/>
+        <location filename="tokentool.ui" line="991"/>
         <source>Dual Crypto Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1006"/>
+        <location filename="tokentool.ui" line="1010"/>
         <source>User PIN Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1025"/>
+        <location filename="tokentool.ui" line="1029"/>
         <source>Token Initialized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1044"/>
+        <location filename="tokentool.ui" line="1048"/>
         <source>Restore Key Not Needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1063"/>
+        <location filename="tokentool.ui" line="1067"/>
         <source>Secondary Authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1079"/>
+        <location filename="tokentool.ui" line="1083"/>
         <source>User PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1097"/>
-        <location filename="tokentool.ui" line="1188"/>
+        <location filename="tokentool.ui" line="1101"/>
+        <location filename="tokentool.ui" line="1192"/>
         <source>Count Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1116"/>
-        <location filename="tokentool.ui" line="1207"/>
+        <location filename="tokentool.ui" line="1120"/>
+        <location filename="tokentool.ui" line="1211"/>
         <source>Final Try</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1135"/>
-        <location filename="tokentool.ui" line="1226"/>
+        <location filename="tokentool.ui" line="1139"/>
+        <location filename="tokentool.ui" line="1230"/>
         <source>Locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1154"/>
-        <location filename="tokentool.ui" line="1245"/>
+        <location filename="tokentool.ui" line="1158"/>
+        <location filename="tokentool.ui" line="1249"/>
         <source>To Be Changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1170"/>
+        <location filename="tokentool.ui" line="1174"/>
         <source>SO PIN Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="68"/>
+        <location filename="tokentool.ui" line="1371"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="72"/>
         <source>PIN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1308"/>
+        <location filename="tokentool.ui" line="1312"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1314"/>
+        <location filename="tokentool.ui" line="1318"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1327"/>
+        <location filename="tokentool.ui" line="1326"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.ui" line="1338"/>
         <source>Delete Selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1330"/>
+        <location filename="tokentool.ui" line="1341"/>
         <source>Delete selected Certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1333"/>
+        <location filename="tokentool.ui" line="1344"/>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1338"/>
+        <location filename="tokentool.ui" line="1349"/>
         <source>Rescan Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1341"/>
+        <location filename="tokentool.ui" line="1352"/>
         <source>F5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1349"/>
+        <location filename="tokentool.ui" line="1360"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="165"/>
-        <location filename="tokentool.ui" line="323"/>
-        <location filename="tokentool.ui" line="547"/>
+        <location filename="tokentool.ui" line="169"/>
+        <location filename="tokentool.ui" line="327"/>
+        <location filename="tokentool.ui" line="551"/>
         <source>Manufacturer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="25"/>
+        <location filename="tokentool.ui" line="29"/>
         <source>Certificates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="53"/>
-        <location filename="tokentool.ui" line="101"/>
+        <location filename="tokentool.ui" line="57"/>
+        <location filename="tokentool.ui" line="105"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="58"/>
-        <location filename="tokentool.ui" line="106"/>
+        <location filename="tokentool.ui" line="62"/>
+        <location filename="tokentool.ui" line="110"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.ui" line="1303"/>
+        <location filename="tokentool.ui" line="1307"/>
         <source>Slots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="79"/>
+        <location filename="tokentool.hxx" line="82"/>
         <source>Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="80"/>
+        <location filename="tokentool.hxx" line="83"/>
         <source>SmardCard Initialization Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="304"/>
+        <location filename="tokentool.hxx" line="310"/>
         <source>Valid Since</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="308"/>
+        <location filename="tokentool.hxx" line="314"/>
         <source>Valid Until</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="312"/>
-        <source>Certificate Serial Number</source>
+        <location filename="tokentool.hxx" line="339"/>
+        <source>Subject Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="316"/>
-        <source>Subject Info</source>
+        <location filename="tokentool.hxx" line="330"/>
+        <source>Issuer Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="335"/>
-        <source>Issuer Info</source>
+        <location filename="tokentool.hxx" line="318"/>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>PIN required</source>
+        <location filename="tokentool.hxx" line="322"/>
+        <source>Digest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="352"/>
-        <source>Please enter PIN</source>
+        <location filename="tokentool.hxx" line="326"/>
+        <source>Serial Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Login Failed</source>
+        <location filename="tokentool.hxx" line="348"/>
+        <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="363"/>
-        <source>Wrong PIN</source>
+        <location filename="tokentool.hxx" line="355"/>
+        <source>%1[%2]</source>
+        <comment>element of a certificate extension map; %1: extension name, %2: map entry name</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="375"/>
-        <source>Delete Failed</source>
+        <location filename="tokentool.hxx" line="361"/>
+        <source>Public Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="376"/>
-        <source>Certificate Deletion Failes</source>
+        <location filename="tokentool.hxx" line="370"/>
+        <source>Algorithm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="430"/>
+        <source>[%1]</source>
+        <comment>stringified representation of nonprintable character; %1: value in hex</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="382"/>
-        <source>E-Mail</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>PIN required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="383"/>
-        <source>URL</source>
+        <location filename="tokentool.hxx" line="462"/>
+        <source>Please enter PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="385"/>
-        <source>error</source>
-        <comment>unknown certificate subject alternate name</comment>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Login Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="473"/>
+        <source>Wrong PIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="485"/>
+        <source>Delete Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="tokentool.hxx" line="486"/>
+        <source>Certificate Deletion Failes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="391"/>
+        <location filename="tokentool.hxx" line="501"/>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="393"/>
+        <location filename="tokentool.hxx" line="503"/>
         <source>Common Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="395"/>
+        <location filename="tokentool.hxx" line="505"/>
         <source>Locality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="397"/>
+        <location filename="tokentool.hxx" line="507"/>
         <source>Organizational Unit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="399"/>
+        <location filename="tokentool.hxx" line="509"/>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="401"/>
+        <location filename="tokentool.hxx" line="511"/>
         <source>State or Province</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tokentool.hxx" line="403"/>
+        <location filename="tokentool.hxx" line="513"/>
         <source>error</source>
         <comment>unknown certificate subject info</comment>
         <translation type="unfinished"></translation>
diff --git a/template.sh b/template.sh
new file mode 100755
index 0000000..beb656d
--- /dev/null
+++ b/template.sh
@@ -0,0 +1,160 @@
+#!/bin/bash -e
+
+##########################################################################################
+#### template for bash scripts #### START BELOW ##########################################
+##########################################################################################
+
+############################################################################ begin logging
+# check if stdout is a terminal...
+if test -t 1; then
+
+    # see if it supports colors...
+    ncolors=$(tput colors)
+
+    if test -n "$ncolors" && test $ncolors -ge 8; then
+        bold="$(tput bold)"
+        underline="$(tput smul)"
+        standout="$(tput smso)"
+        normal="$(tput sgr0)"
+        black="$(tput setaf 0)"
+        red="$(tput setaf 1)"
+        green="$(tput setaf 2)"
+        yellow="$(tput setaf 3)"
+        blue="$(tput setaf 4)"
+        magenta="$(tput setaf 5)"
+        cyan="$(tput setaf 6)"
+        white="$(tput setaf 7)"
+    fi
+fi
+
+append_msg() {
+    if test $# -ne 0; then
+        echo -n ": ${bold}$*"
+    fi
+    echo "${normal}"
+}
+
+# write a message
+message() {
+    if test $# -eq 0; then
+        return
+    fi
+    echo "${bold}${white}$*${normal}" 1>&2
+}
+
+# write a success message
+success() {
+    echo -n "${bold}${green}success" 1>&2
+    append_msg $* 1>&2
+}
+
+# write a notice
+notice() {
+    echo -n "${bold}${yellow}notice" 1>&2
+    append_msg $* 1>&2
+}
+
+# write a warning message
+warning() {
+    echo -en "${bold}${red}warning" 1>&2
+    append_msg $* 1>&2
+}
+
+# write error message
+error() {
+    echo -en "${bold}${red}error" 1>&2
+    append_msg $* 1>&2
+}
+
+# run a command, print the result and abort in case of error
+# option: --ignore: ignore the result, continue in case of error
+run() {
+    ignore=1
+    while test $# -gt 0; do
+        case "$1" in
+            (--ignore) ignore=0;;
+            (*) break;;
+        esac
+        shift;
+    done
+    echo -n "${bold}${yellow}running:${white} $*${normal} … "
+    set +e
+    result=$($* 2>&1)
+    res=$?
+    set -e
+    if test $res -ne 0; then
+        if test $ignore -eq 1; then
+            error "failed with return code: $res"
+            if test -n "$result"; then
+                echo "$result"
+            fi
+            exit 1
+        else
+            warning "ignored return code: $res"
+        fi
+    else
+        success
+    fi
+}
+
+############################################################################ error handler
+function traperror() {
+    set +x
+    local err=($1) # error status
+    local line="$2" # LINENO
+    local linecallfunc="$3"
+    local command="$4"
+    local funcstack="$5"
+    IFS=" "
+    for e in ${err[@]}; do
+        if test -n "$e" -a "$e" != "0"; then
+            error "line $line - command '$command' exited with status: $e (${err[@]})"
+            if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then
+                echo -n "   ... error at ${funcstack} " 1>&2
+                if [ "$linecallfunc" != "" ]; then
+                    echo -n "called at line $linecallfunc" 1>&2
+                fi
+                echo
+            fi
+            exit $e
+        fi
+    done
+    success
+    exit 0
+}
+
+# catch errors
+trap 'traperror "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' ERR SIGINT INT TERM EXIT
+
+
+
+##########################################################################################
+#### START HERE ##########################################################################
+##########################################################################################
+
+######################################################### commandline parameter evaluation
+while test $# -gt 0; do
+    case "$1" in
+        (--help|-h) less <<EOF
+SYNOPSIS
+
+  $0 [OPTIONS]
+
+OPTIONS
+
+  --help, -h                 show this help
+
+DESCRIPTION
+
+EOF
+            exit;;
+        (*) error "unknow option $1, try $0 --help"; exit 1;;
+    esac
+    if test $# -eq 0; then
+        error "missing parameter, try $0 --help"; exit 1
+    fi
+    shift;
+done
+
+##################################################################################### Main
+