diff --git a/Makefile.am b/Makefile.am
index 8e213f3bc..8bff2ef94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,135 +1,135 @@
 # Makefile.am - main makefile for GnuPG
 #     	Copyright (C) 2001, 2004, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-g13
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 EXTRA_DIST = build-aux/config.rpath build-aux/potomo autogen.sh autogen.rc \
 	     ChangeLog-2011 po/ChangeLog-2011 build-aux/ChangeLog-2011 \
 	     VERSION README.GIT build-aux/gitlog-to-changelog \
 	     build-aux/git-log-fix build-aux/git-log-footer \
 	     build-aux/getswdb.sh                           \
 	     build-aux/speedo.mk                            \
              build-aux/speedo/zlib.pc			    \
              build-aux/speedo/w32/inst-options.ini	    \
              build-aux/speedo/w32/inst.nsi		    \
              build-aux/speedo/w32/pkg-copyright.txt	    \
              build-aux/speedo/w32/g4wihelp.c		    \
              build-aux/speedo/w32/pango.modules		    \
              build-aux/speedo/w32/gdk-pixbuf-loaders.cache  \
              build-aux/speedo/w32/exdll.h		    \
              build-aux/speedo/w32/README.txt		    \
              build-aux/speedo/w32/gnupg-logo-150x57.bmp	    \
              build-aux/speedo/w32/gnupg-logo-164x314.bmp    \
              build-aux/speedo/patches/atk-1.32.0.patch	    \
              build-aux/speedo/patches/libiconv-1.14.patch   \
              build-aux/speedo/patches/pango-1.29.4.patch
 
 
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPG
 gpg = g10
 else
 gpg =
 endif
 if BUILD_GPGSM
 sm = sm
 else
 sm =
 endif
 if BUILD_AGENT
 agent = agent
 else
 agent =
 endif
 if BUILD_SCDAEMON
 scd = scd
 else
 scd =
 endif
 if BUILD_G13
 g13 = g13
 else
 g13 =
 endif
 if BUILD_DIRMNGR
 dirmngr = dirmngr
 else
 dirmngr =
 endif
 if BUILD_TOOLS
 tools = tools
 else
 tools =
 endif
 if BUILD_DOC
 doc = doc
 else
 doc =
 endif
 
 if RUN_TESTS
 tests = tests
 else
 tests =
 endif
 
 SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
           ${tools} po ${doc} ${tests}
 
 dist_doc_DATA = README
 
 
 dist-hook: gen-ChangeLog
 
 if HAVE_W32_SYSTEM
 install-data-hook:
 	set -e; \
 	for i in $$($(top_srcdir)/build-aux/potomo \
                      --get-linguas $(top_srcdir)/po) ; do \
            $(MKDIR_P) "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES" || true; \
            rm -f "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" \
                                                  2>/dev/null || true; \
            $(top_srcdir)/build-aux/potomo $(top_srcdir)/po/$$i.po \
               "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
 	done
 endif
 
 
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	if test -d $(top_srcdir)/.git; then				\
+	if test -e $(top_srcdir)/.git; then				\
 	  (cd $(top_srcdir) &&                      			\
 	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
 	    --amend=build-aux/git-log-fix 				\
 	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
           cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;  \
 	  rm -f $(distdir)/ChangeLog;					\
 	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
 	fi
 
 
 stowinstall:
 	$(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/gnupg
diff --git a/autogen.sh b/autogen.sh
index 3fe24ead8..7d843bda0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,469 +1,469 @@
 #! /bin/sh
 # autogen.sh
 # Copyright (C) 2003, 2014 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # This is a generic script to create the configure script and handle cross
 # build environments.  It requires the presence of a autogen.rc file to
 # configure it for the respective package.  It is maintained as part of
 # GnuPG and source copied by other packages.
 #
 # Version: 2014-06-06
 
 configure_ac="configure.ac"
 
 cvtver () {
   awk 'NR==1 {split($NF,A,".");X=1000000*A[1]+1000*A[2]+A[3];print X;exit 0}'
 }
 
 check_version () {
     if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) = 1 ]; then
        return 0
     fi
     echo "**Error**: "\`$1\'" not installed or too old." >&2
     echo '           Version '$3' or newer is required.' >&2
     [ -n "$4" ] && echo '           Note that this is part of '\`$4\''.' >&2
     DIE="yes"
     return 1
 }
 
 fatal () {
     echo "autogen.sh:" "$*" >&2
     DIE=yes
 }
 
 info () {
     if [ -z "${SILENT}" ]; then
       echo "autogen.sh:" "$*" >&2
     fi
 }
 
 die_p () {
   if [ "$DIE" = "yes" ]; then
     echo "autogen.sh: Stop." >&2
     exit 1
   fi
 }
 
 replace_sysroot () {
     configure_opts=$(echo $configure_opts | sed "s#@SYSROOT@#${w32root}#g")
     extraoptions=$(echo $extraoptions | sed "s#@SYSROOT@#${w32root}#g")
 }
 
 # Allow to override the default tool names
 AUTOCONF=${AUTOCONF_PREFIX}${AUTOCONF:-autoconf}${AUTOCONF_SUFFIX}
 AUTOHEADER=${AUTOCONF_PREFIX}${AUTOHEADER:-autoheader}${AUTOCONF_SUFFIX}
 
 AUTOMAKE=${AUTOMAKE_PREFIX}${AUTOMAKE:-automake}${AUTOMAKE_SUFFIX}
 ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
 
 GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX}
 MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
 FORCE=
 SILENT=
 PRINT_HOST=no
 PRINT_BUILD=no
 tmp=$(dirname "$0")
 tsdir=$(cd "${tmp}"; pwd)
 version_parts=3
 
 if [ -n "${AUTOGEN_SH_SILENT}" ]; then
   SILENT=" --silent"
 fi
 if test x"$1" = x"--help"; then
   echo "usage: ./autogen.sh [--silent] [--force] [--build-TYPE] [ARGS]"
   exit 0
 fi
 if test x"$1" = x"--silent"; then
   SILENT=" --silent"
   shift
 fi
 if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
 if test x"$1" = x"--print-host"; then
   PRINT_HOST=yes
   shift
 fi
 if test x"$1" = x"--print-build"; then
   PRINT_BUILD=yes
   shift
 fi
 
 
 # Reject unsafe characters in $HOME, $tsdir and cwd.  We consider spaces
 # as unsafe because it is too easy to get scripts wrong in this regard.
 am_lf='
 '
 case `pwd` in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
     fatal "unsafe working directory name" ;;
 esac
 case $tsdir in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
     fatal "unsafe source directory: \`$tsdir'" ;;
 esac
 case $HOME in
   *[\;\\\"\#\$\&\'\`$am_lf\ \	]*)
     fatal "unsafe home directory: \`$HOME'" ;;
 esac
 die_p
 
 
 # List of variables sourced from autogen.rc.  The strings '@SYSROOT@' in
 # these variables are replaced by the actual system root.
 configure_opts=
 extraoptions=
 # List of optional variables sourced from autogen.rc and ~/.gnupg-autogen.rc
 w32_toolprefixes=
 w32_extraoptions=
 w32ce_toolprefixes=
 w32ce_extraoptions=
 w64_toolprefixes=
 w64_extraoptions=
 amd64_toolprefixes=
 # End list of optional variables sourced from ~/.gnupg-autogen.rc
 # What follows are variables which are sourced but default to
 # environment variables or lacking them hardcoded values.
 #w32root=
 #w32ce_root=
 #w64root=
 #amd64root=
 
 # Convenience option to use certain configure options for some hosts.
 myhost=""
 myhostsub=""
 case "$1" in
     --find-version)
         myhost="find-version"
         SILENT=" --silent"
         shift
         ;;
     --build-w32)
         myhost="w32"
         shift
         ;;
     --build-w32ce)
         myhost="w32"
         myhostsub="ce"
         shift
         ;;
     --build-w64)
         myhost="w32"
         myhostsub="64"
         shift
         ;;
     --build-amd64)
         myhost="amd64"
         shift
         ;;
     --build*)
         fatal "**Error**: invalid build option $1"
         shift
         ;;
     *)
         ;;
 esac
 die_p
 
 
 # Source our configuration
 if [ -f "${tsdir}/autogen.rc" ]; then
     . "${tsdir}/autogen.rc"
 fi
 
 # Source optional site specific configuration
 if [ -f "$HOME/.gnupg-autogen.rc" ]; then
     info "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
     . "$HOME/.gnupg-autogen.rc"
 fi
 
 
 # **** FIND VERSION ****
 # This is a helper for the configure.ac M4 magic
 # Called
 #   ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO]
 # returns a complete version string with automatic beta numbering.
 if [ "$myhost" = "find-version" ]; then
     package="$1"
     major="$2"
     minor="$3"
     micro="$4"
 
     case "$version_parts" in
       2)
         matchstr1="$package-$major.[0-9]*"
         matchstr2="$package-$major-base"
         vers="$major.$minor"
         ;;
       *)
         matchstr1="$package-$major.$minor.[0-9]*"
         matchstr2="$package-$major.$minor-base"
         vers="$major.$minor.$micro"
         ;;
     esac
 
     beta=no
-    if [ -d .git ]; then
+    if [ -e .git ]; then
       ingit=yes
       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
       if [ -n "$tmp" ]; then
           tmp=$(echo "$tmp"|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
       else
           tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
                 | awk -F- '$4!=0{print"-beta"$4}')
       fi
       [ -n "$tmp" ] && beta=yes
       rev=$(git rev-parse --short HEAD | tr -d '\n\r')
       rvd=$((0x$(echo ${rev} | head -c 4)))
     else
       ingit=no
       beta=yes
       tmp="-unknown"
       rev="0000000"
       rvd="0"
     fi
 
     echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
     exit 0
 fi
 # **** end FIND VERSION ****
 
 
 if [ ! -f "$tsdir/build-aux/config.guess" ]; then
     fatal "$tsdir/build-aux/config.guess not found"
     exit 1
 fi
 build=`$tsdir/build-aux/config.guess`
 if [ $PRINT_BUILD = yes ]; then
     echo "$build"
     exit 0
 fi
 
 
 
 # ******************
 #  W32 build script
 # ******************
 if [ "$myhost" = "w32" ]; then
     case $myhostsub in
         ce)
           w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
           extraoptions="$extraoptions $w32ce_extraoptions"
           ;;
         64)
           w32root="$w64root"
           [ -z "$w32root" ] && w32root="$HOME/w64root"
           toolprefixes="$w64_toolprefixes x86_64-w64-mingw32"
           extraoptions="$extraoptions $w64_extraoptions"
           ;;
         *)
           [ -z "$w32root" ] && w32root="$HOME/w32root"
           toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc"
           toolprefixes="$toolprefixes i386-mingw32msvc mingw32"
           extraoptions="$extraoptions $w32_extraoptions"
           ;;
     esac
     info "Using $w32root as standard install directory"
     replace_sysroot
 
     # Locate the cross compiler
     crossbindir=
     for host in $toolprefixes; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
             crossbindir=/usr/${host}/bin
             conf_CC="CC=${host}-gcc"
             break;
         fi
     done
     if [ -z "$crossbindir" ]; then
         fatal "cross compiler kit not installed"
         if [ -z "$myhostsub" ]; then
           info "Under Debian GNU/Linux, you may install it using"
           info "  apt-get install mingw32 mingw32-runtime mingw32-binutils"
         fi
         die_p
     fi
     if [ $PRINT_HOST = yes ]; then
         echo "$host"
         exit 0
     fi
 
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
             fatal "Please run a 'make distclean' first"
             die_p
         fi
     fi
 
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
              --host=${host} --build=${build} SYSROOT=${w32root} \
              PKG_CONFIG_LIBDIR=${w32root} \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
 fi
 # ***** end W32 build script *******
 
 # ***** AMD64 cross build script *******
 # Used to cross-compile for AMD64 (for testing)
 if [ "$myhost" = "amd64" ]; then
     [ -z "$amd64root" ] && amd64root="$HOME/amd64root"
     info "Using $amd64root as standard install directory"
     replace_sysroot
 
     toolprefixes="$amd64_toolprefixes x86_64-linux-gnu amd64-linux-gnu"
 
     # Locate the cross compiler
     crossbindir=
     for host in $toolprefixes ; do
         if ${host}-gcc --version >/dev/null 2>&1 ; then
             crossbindir=/usr/${host}/bin
             conf_CC="CC=${host}-gcc"
             break;
         fi
     done
     if [ -z "$crossbindir" ]; then
         echo "Cross compiler kit not installed" >&2
         echo "Stop." >&2
         exit 1
     fi
     if [ $PRINT_HOST = yes ]; then
         echo "$host"
         exit 0
     fi
 
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
             echo "Please run a 'make distclean' first" >&2
             exit 1
         fi
     fi
 
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${amd64root}  \
              --host=${host} --build=${build} \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc
 fi
 # ***** end AMD64 cross build script *******
 
 
 # Grep the required versions from configure.ac
 autoconf_vers=`sed -n '/^AC_PREREQ(/ {
 s/^.*(\(.*\))/\1/p
 q
 }' ${configure_ac}`
 autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
 
 automake_vers=`sed -n '/^min_automake_version=/ {
 s/^.*="\(.*\)"/\1/p
 q
 }' ${configure_ac}`
 automake_vers_num=`echo "$automake_vers" | cvtver`
 
 if [ -d "${tsdir}/po" ]; then
   gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
 s/^.*\[\(.*\)])/\1/p
 q
 }' ${configure_ac}`
   gettext_vers_num=`echo "$gettext_vers" | cvtver`
 else
   gettext_vers="n/a"
 fi
 
 if [ -z "$autoconf_vers" -o -z "$automake_vers" -o -z "$gettext_vers" ]
 then
   echo "**Error**: version information not found in "\`${configure_ac}\'"." >&2
   exit 1
 fi
 
 
 if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then
     check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf
 fi
 if check_version $AUTOMAKE $automake_vers_num $automake_vers; then
   check_version $ACLOCAL $automake_vers_num $autoconf_vers automake
 fi
 if [ "$gettext_vers" != "n/a" ]; then
   if check_version $GETTEXT $gettext_vers_num $gettext_vers; then
     check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext
   fi
 fi
 
 if [ "$DIE" = "yes" ]; then
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting
 the corresponding environment variables; see README.GIT for details.
 
 EOF
     die_p
 fi
 
 # Check the git setup.
 if [ -d .git ]; then
   CP="cp -a"
   [ -z "${SILENT}" ] && CP="$CP -v"
   if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     [ -z "${SILENT}" ] && cat <<EOF
 *** Activating trailing whitespace git pre-commit hook. ***
     For more information see this thread:
       http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
     To deactivate this pre-commit hook again move .git/hooks/pre-commit
     and .git/hooks/pre-commit.sample out of the way.
 EOF
       $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
       chmod +x  .git/hooks/pre-commit
   fi
 
   if [ "$gettext_vers" != "n/a" ]; then
     tmp=$(git config --get filter.cleanpo.clean)
     if [ "$tmp" != \
           "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
     then
       info "*** Adding GIT filter.cleanpo.clean configuration."
       git config --add filter.cleanpo.clean \
         "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
     fi
   fi
   if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
       [ -z "${SILENT}" ] && cat <<EOF
 *** Activating commit log message check hook. ***
 EOF
       $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
       chmod +x  .git/hooks/commit-msg
   fi
 fi
 
 aclocal_flags="-I m4"
 if [ -n "${extra_aclocal_flags}" ]; then
   aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
 fi
 if [ -n "${ACLOCAL_FLAGS}" ]; then
   aclocal_flags="${aclocal_flags} ${ACLOCAL_FLAGS}"
 fi
 info "Running $ACLOCAL ${aclocal_flags} ..."
 $ACLOCAL ${aclocal_flags}
 info "Running autoheader..."
 $AUTOHEADER
 info "Running automake --gnu ..."
 $AUTOMAKE --gnu;
 info "Running autoconf${FORCE} ..."
 $AUTOCONF${FORCE}
 
 info "You may now run:${am_lf}  ${final_info}"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5449d07a9..a1a570c38 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,162 +1,162 @@
 # Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
 examples = examples/README examples/scd-event examples/trustlist.txt \
 	   examples/gpgconf.conf examples/pwpattern.list
 
 helpfiles = help.txt help.be.txt help.ca.txt help.cs.txt		\
             help.da.txt help.de.txt help.el.txt help.eo.txt		\
             help.es.txt help.et.txt help.fi.txt help.fr.txt		\
             help.gl.txt help.hu.txt help.id.txt help.it.txt		\
             help.ja.txt help.nb.txt help.pl.txt help.pt.txt		\
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
 EXTRA_DIST = samplekeys.asc mksamplekeys \
 	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png gnupg-logo-tr.png\
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
              FAQ gnupg7.texi mkdefsinc.c defsincdate \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
 	     gpgv.texi yat2m.c ChangeLog-2011 whats-new-in-2.1.txt
 
 BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
                 gnupg-card-architecture.pdf defsincdate defs.inc
 
 info_TEXINFOS = gnupg.texi
 
 dist_pkgdata_DATA = qualified.txt com-certs.pem $(helpfiles)
 
 nobase_dist_doc_DATA = FAQ DETAILS HACKING DCO TRANSLATE OpenPGP KEYSERVER \
                        $(examples)
 
 #dist_html_DATA =
 
 
 gnupg_TEXINFOS = \
 	gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi \
 	tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
 	sysnotes.texi gnupg-card-architecture.fig dirmngr.texi \
 	howtos.texi howto-create-a-server-cert.texi
 
 gnupg.texi : defs.inc
 
 DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
 
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
         --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.1"
 
 myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
 	        dirmngr.texi scdaemon.texi tools.texi
 myman_pages   = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \
                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
 		applygnupgdefaults.8 \
 		dirmngr-client.1
 
 man_MANS = $(myman_pages) gnupg.7
 
 watchgnupg_SOURCE = gnupg.texi
 
 
 CLEANFILES = yat2m mkdefsinc defs.inc
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
 		 $(myman_pages) gpg-zip.1 gnupg.7
 
 yat2m: yat2m.c
 	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
 
 mkdefsinc: mkdefsinc.c Makefile ../config.h
 	$(CC_FOR_BUILD) -I. -I.. -I$(srcdir) $(AM_CPPFLAGS) \
                         -o $@ $(srcdir)/mkdefsinc.c
 
 
 .fig.png:
 	fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.jpg:
 	fig2dev -L jpeg `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.eps:
 	fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 .fig.pdf:
 	fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
 
 
 yat2m-stamp: $(myman_sources) defs.inc
 	@rm -f yat2m-stamp.tmp
 	@touch yat2m-stamp.tmp
 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
 	for file in $(myman_sources) ; do \
               ./yat2m $(YAT2M_OPTIONS) --store \
                   --date "`cat $$incd 2>/dev/null`" \
 	          `test -f '$$file' || echo '$(srcdir)/'`$$file ; done
 	@mv -f yat2m-stamp.tmp $@
 
 yat2m-stamp: yat2m
 
 $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
 	@if test -f $@; then :; else \
             trap 'rm -rf yat2m-stamp yat2m-lock' 1 2 13 15; \
                if mkdir yat2m-lock 2>/dev/null; then \
                  rm -f yat2m-stamp; \
                  $(MAKE) $(AM_MAKEFLAGS) yat2m-stamp; \
                  rmdir yat2m-lock; \
                else \
                  while test -d yat2m-lock; do sleep 1; done; \
                  test -f yat2m-stamp; exit $$?; \
                fi; \
              fi
 
 dist-hook: defsincdate
 
 defsincdate: $(gnupg_TEXINFOS)
 	: >defsincdate ; \
-	if test -d $(top_srcdir)/.git; then \
+	if test -e $(top_srcdir)/.git; then \
 	  (cd $(srcdir) && git log -1 --format='%ct' \
                -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
 	fi
 
 defs.inc : defsincdate Makefile mkdefsinc
 	incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
 	./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
 	    $(gnupg_TEXINFOS) >$@
 
 
 online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
 	cp $(srcdir)/gnupg-logo-tr.png gnupg.html/; \
         user=werner ; webhost="ftp.gnupg.org" ; dashdevel="" ; \
         if echo "@PACKAGE_VERSION@" | grep -- "-beta" >/dev/null; then \
 	  dashdevel="-devel" ; \
 	else \
           rsync -v gnupg.pdf $${user}@$${webhost}:webspace/manuals/ ; \
         fi ; \
 	cd gnupg.html ; \
         rsync -vr --exclude='.git' .  \
 	  $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/