diff --git a/cnslock/Makefile.am b/cnslock/Makefile.am
index 6404d2c..1103536 100644
--- a/cnslock/Makefile.am
+++ b/cnslock/Makefile.am
@@ -1,5 +1,6 @@
 bin_PROGRAMS = cnslock
 cnslock_SOURCES = cnslock.c kleds.c graphics/caps_num_scroll.xpm include/kleds.h
+dist_man_MANS = cnslock.1
 EXTRA_DIST = CHANGES
 
 AM_CFLAGS = $(x11_CFLAGS) $(dockapp_CFLAGS)
diff --git a/cnslock/cnslock.1.in b/cnslock/cnslock.1.in
new file mode 100644
index 0000000..e707d6d
--- /dev/null
+++ b/cnslock/cnslock.1.in
@@ -0,0 +1,21 @@
+.TH CNSLOCK "1" "February 2017" @VERSION@
+.SH NAME
+cnslock \- Window Maker dockapp that displays the various states ofthe CAPS,
+NUM and SCROLL LOCK keys.
+.SH SYNOPSIS
+.B cnslock
+[\fI\,OPTIONS\/\fR]
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help text and exit
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+show program version and exit
+.TP
+\fB\-w\fR, \fB\-\-windowed\fR
+run the application in windowed mode
+.SH AUTHOR
+cnslock was written by Simon Hunter.  Now maintained by the Window Maker Team
+<wmaker-dev@lists.windowmaker.org>.
+
diff --git a/cnslock/configure.ac b/cnslock/configure.ac
index 7181c57..27c9468 100644
--- a/cnslock/configure.ac
+++ b/cnslock/configure.ac
@@ -4,5 +4,5 @@ AC_CONFIG_SRCDIR([configure.ac])
 AC_PROG_CC
 PKG_CHECK_MODULES([x11], [x11])
 PKG_CHECK_MODULES([dockapp], [dockapp])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile cnslock.1])
 AC_OUTPUT