diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
index f43265e..df4aa04 100644
--- a/ccid/src/Makefile.am
+++ b/ccid/src/Makefile.am
@@ -32,6 +32,8 @@ ccid-emulator.ggo: ccid-emulator.ggo.in
 ccid-emulator.1:
 	$(HELP2MAN) \
 		--output=$@ \
+		--no-info \
+		--source='$(PACKAGE_STRING)' \
 		--version-string='$(PACKAGE) $(VERSION)' \
 		$(srcdir)/ccid-emulator
 
diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
index 27eab86..0828bb0 100644
--- a/npa/src/Makefile.am
+++ b/npa/src/Makefile.am
@@ -42,7 +42,9 @@ npa-tool.ggo: npa-tool.ggo.in
 npa-tool.1:
 	$(HELP2MAN) \
 		--output=$@ \
-		$(srcdir)/npa-tool
+		--no-info \
+		--source='$(PACKAGE_STRING)' \
+		$(builddir)/npa-tool
 
 
 bin_PROGRAMS = npa-tool
diff --git a/pcsc-relay/src/Makefile.am b/pcsc-relay/src/Makefile.am
index 3f25e7e..9f78137 100644
--- a/pcsc-relay/src/Makefile.am
+++ b/pcsc-relay/src/Makefile.am
@@ -18,6 +18,8 @@ dist_man1_MANS		= pcsc-relay.1
 pcsc-relay.1:
 	$(HELP2MAN) \
 		--output=$@ \
+		--no-info \
+		--source='$(PACKAGE_STRING)' \
 		--version-string='$(PACKAGE) $(VERSION)' \
 		$(srcdir)/pcsc-relay
 
diff --git a/pcsc-relay/src/pcsc-relay.ggo.in b/pcsc-relay/src/pcsc-relay.ggo.in
index 39bc171..a9b7a95 100644
--- a/pcsc-relay/src/pcsc-relay.ggo.in
+++ b/pcsc-relay/src/pcsc-relay.ggo.in
@@ -21,4 +21,4 @@ option "verbose"    v
 text "
 Report bugs to @PACKAGE_BUGREPORT@
 
-Written by Frank Morgner <morgner@informatik.hu-berlin.de> and Dominik Oepen <oepen@informatik.hu-berlin.de>"
+Written by Frank Morgner and Dominik Oepen"