diff --git a/ccid/configure.ac b/ccid/configure.ac
index 2872d52..f331df2 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -17,6 +17,8 @@ AC_PROG_LN_S
 AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
+AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
+AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //)
 
 # If you need to see the details, just run make V=1.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/ccid/src/Makefile.am b/ccid/src/Makefile.am
index cc9d74e..9558909 100644
--- a/ccid/src/Makefile.am
+++ b/ccid/src/Makefile.am
@@ -11,7 +11,9 @@ BUILT_SOURCES = cmdline.h cmdline.c
 EXTRA_DIST  = ccid-emulator.ggo ccid-emulator.ggo.in
 EXTRA_DIST += $(shell find $(top_srcdir)/src/opensc -path '*/.svn' -prune -o -type f -a -name '*.h' -print)
 EXTRA_DIST += $(shell find -L $(top_srcdir)/src/opensc-npa -path '*/.git' -prune -o -type f -a -name '*.h' -print)
-DISTCLEANFILES = $(BUILT_SOURCES) ccid-emulator.ggo
+MAINTAINERCLEANFILES = $(BUILT_SOURCES) ccid-emulator.ggo $(dist_man1_MANS)
+
+dist_man1_MANS		= ccid-emulator.1
 
 ccid_emulator_SOURCES = ccid.c usbstring.c usb.c sslutil.c $(BUILT_SOURCES)
 ccid_emulator_LDADD =  $(OPENSSL_LIBS) $(PTHREAD_LIBS)
@@ -21,12 +23,19 @@ ccid_emulator_CFLAGS = $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
 ccid-emulator.c: $(BUILT_SOURCES)
 
 $(BUILT_SOURCES): ccid-emulator.ggo
-	gengetopt --output-dir=$(srcdir) < $<
+	$(GENGETOPT) --output-dir=$(srcdir) < $<
 
 ccid-emulator.ggo: ccid-emulator.ggo.in
 	$(do_subst) < $< > $(srcdir)/$@
 
 
+ccid-emulator.1:
+	$(HELP2MAN) \
+		--output=$@ \
+		--version-string='$(PACKAGE) $(VERSION)' \
+		$(srcdir)/ccid-emulator
+
+
 bin_PROGRAMS =
 
 noinst_HEADERS = \
diff --git a/ccid/src/ccid-emulator.ggo.in b/ccid/src/ccid-emulator.ggo.in
index 78dddef..caaf383 100644
--- a/ccid/src/ccid-emulator.ggo.in
+++ b/ccid/src/ccid-emulator.ggo.in
@@ -1,4 +1,3 @@
-package "npa-tool"
 purpose "Access the German electronic identity card (neuer Personalausweis, nPA)"
 
 option "info"           i
diff --git a/npa/configure.ac b/npa/configure.ac
index 57d7006..4dc68e2 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -27,6 +27,8 @@ AC_PROG_INSTALL
 AC_PROG_SED
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
+AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
+AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //)
 
 # If you need to see the details, just run make V=1.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
index 9dca685..90789a3 100644
--- a/npa/src/Makefile.am
+++ b/npa/src/Makefile.am
@@ -10,7 +10,9 @@ BUILT_SOURCES = cmdline.h cmdline.c
 
 EXTRA_DIST  = npa-tool.ggo npa-tool.ggo.in
 EXTRA_DIST += $(shell find -L $(top_srcdir)/src/opensc -path '*/.git' -prune -o -type f -a -name '*.h' -print)
-DISTCLEANFILES = $(BUILT_SOURCES) npa-tool.ggo
+MAINTAINERCLEANFILES = $(BUILT_SOURCES) npa-tool.ggo $(dist_man1_MANS)
+
+dist_man1_MANS		= npa-tool.1
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/npa -I$(top_srcdir)/src/opensc/src
 
@@ -31,12 +33,18 @@ example_CFLAGS = $(OPENSSL_CFLAGS)
 npa-tool.c: $(BUILT_SOURCES)
 
 $(BUILT_SOURCES): npa-tool.ggo
-	gengetopt --output-dir=$(srcdir) < $<
+	$(GENGETOPT) --output-dir=$(srcdir) < $<
 
 npa-tool.ggo: npa-tool.ggo.in
 	$(do_subst) < $< > $(srcdir)/$@
 
 
+npa-tool.1:
+	$(HELP2MAN) \
+		--output=$@ \
+		$(srcdir)/npa-tool
+
+
 bin_PROGRAMS = npa-tool
 noinst_PROGRAMS = example
 
diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac
index 5fb2e93..074252f 100644
--- a/pcsc-relay/configure.ac
+++ b/pcsc-relay/configure.ac
@@ -12,6 +12,8 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PATH_PYTHON
 PKG_PROG_PKG_CONFIG
+AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
+AC_PATH_PROG(GENGETOPT, gengetopt, false // No gengetopt //)
 
 # If you need to see the details, just run make V=1.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/pcsc-relay/src/Makefile.am b/pcsc-relay/src/Makefile.am
index a9f66b0..a2d098e 100644
--- a/pcsc-relay/src/Makefile.am
+++ b/pcsc-relay/src/Makefile.am
@@ -10,6 +10,17 @@ BUILT_SOURCES = cmdline.h cmdline.c
 
 EXTRA_DIST  = pcsc-relay.ggo pcsc-relay.ggo.in
 EXTRA_DIST += picc.py
+MAINTAINERCLEANFILES = $(BUILT_SOURCES) npa-tool.ggo $(dist_man1_MANS)
+
+dist_man1_MANS		= pcsc-relay.1
+
+
+pcsc-relay.1:
+	$(HELP2MAN) \
+		--output=$@ \
+		--version-string='$(PACKAGE) $(VERSION)' \
+		$(srcdir)/pcsc-relay
+
 
 bin_PROGRAMS = pcsc-relay
 bin_SCRIPTS = picc.py
@@ -23,7 +34,7 @@ noinst_HEADERS = pcscutil.h pcsc-relay.h
 pcsc-relay.c: $(BUILT_SOURCES)
 
 $(BUILT_SOURCES): pcsc-relay.ggo
-	gengetopt --output-dir=$(srcdir) < $<
+	$(GENGETOPT) --output-dir=$(srcdir) < $<
 
 pcsc-relay.ggo: pcsc-relay.ggo.in
 	$(do_subst) < $< > $(srcdir)/$@