Index: b/Makefile.am
===================================================================
--- b/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # Makefile.am - main makefile for GnuPG
-#     	Copyright (C) 2001, 2004, 2010 Free Software Foundation, Inc.
+# 	Copyright (C) 2001, 2004, 2010 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -25,9 +25,9 @@
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 EXTRA_DIST = scripts/config.rpath scripts/potomo autogen.sh README.GIT \
-	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
-	     scripts/gitlog-to-changelog \
-	     scripts/git-log-fix scripts/git-log-footer
+             ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011 \
+             scripts/gitlog-to-changelog \
+             scripts/git-log-fix scripts/git-log-footer
 DISTCLEANFILES = g10defs.h
 
 if BUILD_GPGSM
@@ -102,12 +102,12 @@
 install-data-hook:
 	set -e; \
 	for i in $$($(top_srcdir)/scripts/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)/scripts/potomo $(top_srcdir)/po/$$i.po \
-              "$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
+			--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)/scripts/potomo $(top_srcdir)/po/$$i.po \
+		"$(DESTDIR)$(localedir)/$$i/LC_MESSAGES/gnupg2.mo" ; \
 	done
 endif
 
@@ -115,14 +115,14 @@
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	if test -d $(top_srcdir)/.git; then				\
-	  (cd $(top_srcdir) &&                      			\
-	    $(GITLOG_TO_CHANGELOG) --append-dot --tear-off		\
-	    --amend=scripts/git-log-fix	 				\
-	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
-          cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	if test -d $(top_srcdir)/.git; then \
+		(cd $(top_srcdir) && \
+		$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
+			--amend=scripts/git-log-fix \
+			--since=$(gen_start_date) ) > $(distdir)/cl-t; \
+		cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \
+		rm -f $(distdir)/ChangeLog; \
+		mv $(distdir)/cl-t $(distdir)/ChangeLog; \
 	fi
 
 
Index: b/agent/Makefile.am
===================================================================
--- b/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -66,14 +66,11 @@
 
 gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 gpg_agent_LDADD = $(commonpth_libs) \
-                $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
-	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(resource_objs)
+                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \
+                  $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
+                  $(resource_objs)
 gpg_agent_LDFLAGS = $(extra_bin_ldflags) $(gpg_agent_res_ldflags)
 gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps)
-                $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \
-	        $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \
-		$(resource_objs)
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
@@ -81,15 +78,15 @@
 
 gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
 gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \
-         $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
+                         $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
 gpg_preset_passphrase_SOURCES = \
 	preset-passphrase.c
 
 # Needs $(NETLIBS) for libsimple-pwquery.la.
 gpg_preset_passphrase_LDADD = \
-         $(pwquery_libs) $(common_libs) \
-	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
+	$(pwquery_libs) $(common_libs) \
+	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
 
 # Make sure that all libs are build before we use them.  This is
@@ -104,7 +101,7 @@
 TESTS = t-protect
 
 t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-	          $(LIBINTL) $(LIBICONV) $(NETLIBS)
+                 $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
 t_protect_SOURCES = t-protect.c protect.c
 t_protect_LDADD = $(t_common_ldadd)