diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 98a5ebc4..b65ea483 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -3,6 +3,7 @@ man_MANS = \
   sesman.ini.5 \
   xrdp.ini.5 \
   xrdp.8 \
+  xrdp-keygen.8 \
   xrdp-sesadmin.8 \
   xrdp-sesman.8 \
   xrdp-sesrun.8
diff --git a/docs/man/xrdp-keygen.8 b/docs/man/xrdp-keygen.8
new file mode 100644
index 00000000..71269f5c
--- /dev/null
+++ b/docs/man/xrdp-keygen.8
@@ -0,0 +1,40 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH xrdp\-keygen 8 "0.7.0" "xrdp team"
+.SH NAME
+xrdp\-keygen \- xrdp RSA key generation utility
+
+.SH SYNOPSIS
+.B xrdp\-keygen xrdp
+< \fIoutfile\fP | \fBauto\fP >
+.br
+.B xrdp\-keygen test
+
+.SH DESCRIPTION
+\fBxrdp\-keygen\fP generates the file
+.I /etc/xrdp/rsakeys.ini
+which contains the RSA key pair used to perform authentication to
+remote clients. The public key is self-signed.
+
+.SH OPTIONS
+This program takes one of the following options:
+.TP
+\fBxrdp\fP \fIoutfile\fP
+Generate a new key pair.
+The key data is stored in the file named \fIoutfile\fP.
+.br
+If \fBauto\fP is used as \fIoutfile\fP, the default file \fI/etc/xrdp/rsakeys.ini\fP gets created if it does not yet exists.
+.TP
+.B test
+Generate a test key pair and print information to standard output.
+
+.SH FILES
+.TP
+.I /etc/xrdp/rsakeys.ini
+RSA public and private key pair used to identify this XRDP server.
+
+.SH SEE ALSO
+.BR xrdp (8),
+.BR xrdp\-sesman (8).
+
+.SH AUTHOR
+This manual page was originally written by Vincent Bernat <bernat@luffy.cx>.