diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index 5ec4671..7e2d388 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -29,6 +29,7 @@ AC_PROG_SED
 AM_PATH_PYTHON
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
+AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
 
 # If you need to see the details, just run make V=1.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
diff --git a/virtualsmartcard/src/vpicc/Makefile.am b/virtualsmartcard/src/vpicc/Makefile.am
index 65c9b99..c0393be 100644
--- a/virtualsmartcard/src/vpicc/Makefile.am
+++ b/virtualsmartcard/src/vpicc/Makefile.am
@@ -1,6 +1,9 @@
 bin_SCRIPTS = vicc
 CLEANFILES = $(bin_SCRIPTS)
 EXTRA_DIST = vicc.in
+MAINTAINERCLEANFILES = $(dist_man1_MANS)
+
+dist_man1_MANS		= vicc.1
 
 vpiccdir = $(pythondir)/virtualsmartcard
 vpicccardsdir = $(vpiccdir)/cards
@@ -31,3 +34,9 @@ do_subst = $(SED) \
 $(builddir)/vicc: vicc.in Makefile
 	$(do_subst) < $(srcdir)/vicc.in > $(builddir)/vicc
 	chmod +x $(builddir)/vicc
+
+$(builddir)/vicc.1:
+	$(HELP2MAN) \
+		--no-discard-stderr \
+		--output=$@ \
+		$(srcdir)/vicc