diff --git a/CMakeLists.txt b/CMakeLists.txt
index fba6fed..01e28f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ add_executable(cmatrix cmatrix.c)
 target_link_libraries(cmatrix ${CURSES_LIBRARIES})
 
 install(TARGETS cmatrix DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES cmatrix.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+install(FILES cmatrix.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
 
 if     (UNIX)
 	foreach    (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
diff --git a/Makefile.am b/Makefile.am
index be482b4..3b7b8ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = cmatrix
 cmatrix_SOURCES = cmatrix.c
 
-man_MANS = cmatrix.1
+man_MANS = cmatrix.6
 
 if MATRIX_FONTS
 BUILD_FONTS = 1
@@ -11,7 +11,7 @@ endif
 
 EXTRA_DIST =	COPYING INSTALL install-sh \
 		missing mkinstalldirs matrix.fnt \
-		matrix.psf.gz mtx.pcf cmatrix.1 cmatrix.spec
+		matrix.psf.gz mtx.pcf cmatrix.6 cmatrix.spec
 
 install-data-local:
 	@if test $(BUILD_FONTS) = 1; then \
diff --git a/cmatrix.1 b/cmatrix.1
deleted file mode 100644
index 59c6654..0000000
--- a/cmatrix.1
+++ /dev/null
@@ -1,101 +0,0 @@
-.TH CMatrix 1 "Mon May 3 1999"
-.SH NAME
-CMatrix
-.SH SYNOPSIS
-.B cmatrix
-[\-abBflohnsmVx] [\-u update] [\-C color]
-.SH DESCRIPTION
-Shows a scrolling 'Matrix' like screen in Linux
-.SS OPTIONS
-.TP
-.I "\-a"
-Asynchronous scroll
-.TP
-.I "\-b"
-Bold characters on
-.TP
-.I "\-B"
-All bold characters (overrides \-b)
-.TP
-.I "\-f"
-Force the linux $TERM type to be on
-.TP
-.I "\-l"
-Linux mode (sets "matrix.fnt" font in console)
-.TP
-.I "\-o"
-Use old-style scrolling
-.TP
-.I "\-c"
-Only print the shadows of letters 
-.TP
-.I "\-L"
-Locks cmatrix, Unable to quit
-.TP
-.I "\-h, \-?"
-Print usage and exit
-.TP
-.I "\-r"
-"Rainbow" mode, rainbow colored character
-.TP
-.I "\-k"
-Every characters change 
-.TP
-.I "\-n"
-No bold characters (overrides \-b and \-B)
-.TP
-.I "\-s"
-"Screensaver" mode, exits on first keystroke
-.TP
-.I "\-m"
-"Lambda" mode, every character becomes a lambda
-.TP
-.I "\-x"
-X window mode, use if your xterm is using mtx.pcf
-.TP
-.I "\-V"
-Print version information and exit
-.TP
-.I "\-u delay"
-Screen update delay 0 - 9, default 4
-.TP
-.I "\-C color"
-Use this color for matrix (default green).
-Valid colors are green, red, blue, white, yellow, cyan, magenta and black.
-.TP
-.I "\-M message"
-Add a message in the center of cmatrix
-.TP
-.I "\-t tty"
-Set tty to use
-.SS KEYSTROKES
-The following keystrokes are available during execution (unavailable in
-\-s mode)
-.TP
-.I "a"
-Toggle asynchronous scroll
-.TP
-.I "b"
-Random bold characters
-.TP
-.I "B"
-All bold characters
-.TP
-.I "n"
-Turn off bold characters
-.TP
-.I "0\-9"
-Adjust update speed
-.TP
-.I "! @ # $ % ^ & )"
-Change the color of the matrix to the corresponding color:
-! \- red, @ \- green, # \- yellow, $ \- blue, % \- magenta, ^ \- cyan,
-& \- white, ) \- black.
-.TP
-.I "q"
-Quit the program
-.SH BUGS
-This program is very CPU intensive.  Don't be surprised if it eats up over
-40% of your CPU at times.
-.SH HOMEPAGE
-http://www.github.com/abishekvashok/cmatrix
diff --git a/cmatrix.6 b/cmatrix.6
new file mode 100644
index 0000000..fb7d286
--- /dev/null
+++ b/cmatrix.6
@@ -0,0 +1,117 @@
+.Dd March 31, 2024
+.Dt CMATRIX 6
+.Os
+.Sh NAME
+.Nm cmatrix
+.Nd Matrix digital rain terminal screensaver and lock screen
+.Sh SYNOPSIS
+.Nm
+.Op Fl \&?abBcfhlLmnorsVx
+.Op Fl C Ar color
+.Op Fl M Ar message
+.Op Fl u Ar delay
+.Sh DESCRIPTION
+The
+.Nm
+command shows 8-color text raining down a terminal, at a
+user-defined speed, either at the same rate or asyncronously.
+.Pp
+The following command-line options are available:
+.Pp
+.Bl -tag -width "-M message" -compact
+.It Fl a
+Asynchronous scroll
+.It Fl b
+Bold characters on
+.It Fl B
+All bold characters, overrides
+.Fl b
+.It Fl c
+Use Japanese characters, requires appropriate font
+.It Fl C Ar color
+.Sq Ar green
+Use one of the eight
+.Ar color Ns s in the table below
+.It Fl f
+Force the
+.Va $TERM
+type to be on
+.It Fl h , Fl \&?
+Print usage and exit
+.It Fl l
+Linux mode, use matrix console font
+.Pq matrix.fnt
+.It Fl L
+Lock mode, can be
+.Xr kill 1 Ns ed
+from another terminal
+.It Fl m
+Lambda mode, every character becomes a lambda
+.It Fl M Ar message
+Add a centered
+.Ar message
+.It Fl n
+No bold characters, overrides
+.Fl b
+and
+.Fl B
+.It Fl o
+Use old-style scrolling
+.It Fl r
+Rainbow mode, rainbow colored characters
+.It Fl s
+Screensaver mode, exits on any keystroke
+.It Fl u Ar delay
+.Sq Ar 4
+Screen update delay
+.Ar 0 Ns Pf - Ar 9
+.It Fl V
+Print version information and exit
+.It Fl x
+X window mode, use if your
+.Xr xterm 1
+is using mtx.pcf
+.El
+.Pp
+The following keystrokes are available during execution:
+.Pp
+.Bl -tag -width "! @ # $ % ^ & )" -compact
+.It Ic "! @ # $ % ^ & )"
+Switch scheme to corresponding
+.Ar color :
+.Pp
+.TS
+aw10 aw10.
+! red	@ green
+# yellow	$ blue
+% magenta	^ cyan
+& white	) black
+.TE
+.Pp
+.It Ic 0 Ns Pf - Ic 9
+Set update delay
+.It Ic a
+Toggle asynchronous scroll
+.It Ic b
+Random bold characters
+.It Ic B
+All bold characters
+.It Ic n
+Turn off bold characters
+.It Ic p , Ic P
+Pause
+.It Ic q
+Quit
+.El
+.Sh EXAMPLES
+Emulate the digital rain from the original movie:
+.Dl $ cmatrix -ac
+.Pp
+Emulate the classic screensaver:
+.Dl $ cmatrix -os
+.Sh SEE ALSO
+.Xr kill 1 ,
+.Xr xterm 1 ,
+.Xr ncurses 3
+.Pp
+.Lk http://www.github.com/abishekvashok/cmatrix Homepage