diff --git a/Makefile.am b/Makefile.am
index f188cda..e8e16bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,103 +1,104 @@
 # Makefile.am - main makefile for libksba
 #     	Copyright (C) 2001, 2002 g10 Code GmbH
 #
 # This file is part of KSBA.
 #
 # KSBA 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.
 #
 # KSBA 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 -I gl/m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-doc
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
 EXTRA_DIST = autogen.sh autogen.rc \
              COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3                 \
              ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 	\
              tests/ChangeLog-2011 			     		\
              build-aux/git-log-footer build-aux/git-log-fix
 
 
 if CROSS_COMPILING
 tests =
 else
 tests = tests
 endif
 
 if BUILD_DOC
 doc = doc
 else
 doc =
 endif
 
 SUBDIRS = m4 gl src $(tests) $(doc)
 
 dist-hook: gen-ChangeLog
 
 distcheck-hook:
 	set -e; ( \
 	pref="#+macro: $$(echo $(PACKAGE_NAME)|tr '-' '_')_" ;\
 	reldate="$$(date -u +%Y-%m-%d)" ;\
         echo "$${pref}ver  $(PACKAGE_VERSION)"  ;\
         echo "$${pref}date $${reldate}" ;\
         list='$(DIST_ARCHIVES)'; for i in $$list; do \
 	  case "$$i" in *.tar.bz2) \
             echo "$${pref}size $$(wc -c <$$i|awk '{print int($$1/1024)}')k" ;\
 	    echo "$${pref}sha1 $$(sha1sum <$$i|cut -d' ' -f1)" ;\
 	    echo "$${pref}sha2 $$(sha256sum <$$i|cut -d' ' -f1)" ;;\
 	  esac;\
 	done ) | tee $(distdir).swdb
 
 
 gen_start_date = 2011-12-01T00: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=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/libksba
 
+
+
 # Coverage targets
 if HAVE_GCOV
 
-.PHONY: clean-coverage
 clean-coverage:
 	@echo Removing old coverage results
 	-find -name '*.gcda' -print | xargs -r rm
 	-find -name '*.gcno' -print | xargs -r rm
 	-rm -rf coverage.info coveragereport
 
-.PHONY: coverage-html clean-coverage
 coverage-html: check
 	@echo Collecting coverage data with lcov
 	$(top_srcdir)/autogen.sh --coverage $(LCOV) $(GCOV) $(abs_builddir) \
 		tests src
 	$(top_srcdir)/autogen.sh --report $(LCOV) $(GENHTML) $(abs_builddir) \
 		'*/tests/*' '*/asn1-parse.c' '*/asn1-parse.y'
 
 clean-local: clean-coverage
 
 endif # HAVE_GCOV
+
+.PHONY: gen-ChangeLog clean-coverage coverage-html