diff --git a/plist b/plist
index fc661be35..3562b6d22 100644
--- a/plist
+++ b/plist
@@ -1003,6 +1003,7 @@
 /usr/local/sbin/ppp-uptime.sh
 /usr/local/share/man/man8/opnsense-importer.8.gz
 /usr/local/share/man/man8/opnsense-installer.8.gz
+/usr/local/share/man/man8/opnsense-shell.8.gz
 /usr/local/wizard/openvpn.xml
 /usr/local/wizard/system.xml
 /usr/local/www/carp_status.php
diff --git a/src/man/man8/opnsense-importer.8 b/src/man/man8/opnsense-importer.8
index 7964ef55e..d9ad5aedf 100644
--- a/src/man/man8/opnsense-importer.8
+++ b/src/man/man8/opnsense-importer.8
@@ -48,9 +48,14 @@ prompt when no current configuration is found in the system.
 This mode is used for install media duties to allow early configuration
 imports to be able to live-boot into them afterwards.
 .El
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr opnsense-installer 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in OPNsense 17.1.4.
+It was derived from code written for the
+.Xr opnsense-installer 8
+utility.
 .Sh AUTHORS
 .An Franco Fichtner Aq Mt franco@opnsense.org
diff --git a/src/man/man8/opnsense-installer.8 b/src/man/man8/opnsense-installer.8
index aba16d6ca..568967ee4 100644
--- a/src/man/man8/opnsense-installer.8
+++ b/src/man/man8/opnsense-installer.8
@@ -43,9 +43,17 @@ The purpose of the installer is to install the system on a target
 disk using several options like UFS, ZFS, RAID, GPT, MBR, etc.
 It may also carry out tasks such as configuration import or password
 recovery.
-.Sh EXIT STATUS
-.Ex -std
 .Sh SEE ALSO
 .Xr opnsense-importer 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in pfSense under the name
+.Nm lua_installer
+and operates the historical
+.Nm bsdinstaller ,
+which first appeared in
+.Dx .
+Both projects no longer use these programs.
 .Sh AUTHORS
 .An Scott Ullrich Aq Mt sullrich@gmail.com
diff --git a/src/man/man8/opnsense-shell.8 b/src/man/man8/opnsense-shell.8
new file mode 100644
index 000000000..035046e60
--- /dev/null
+++ b/src/man/man8/opnsense-shell.8
@@ -0,0 +1,55 @@
+.\"
+.\" Copyright (c) 2018 Franco Fichtner <franco@opnsense.org>
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd May 19, 2018
+.Dt OPNSENSE-SHELL 8
+.Os
+.Sh NAME
+.Nm opnsense-shell
+.Nd OPNsense console menu
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+The
+.Nm
+utility offers the administrator easy access to core functionality
+of the system.
+Said functionality only works for the root user, but when arguments
+are given the program will pass them to a real shell directly to allow
+compatibility with the
+.Xr rc 8
+system.
+.Sh SEE ALSO
+.Xr opnsense-installer 8 ,
+.Xr rc 8
+.Sh HISTORY
+The
+.Nm
+utility first appeared in M0n0wall under the name
+.Nm rc.initial
+and is therefore also being used by pfSense.
+.Sh AUTHORS
+.An Manuel Kasper Aq Mt mk@neon1.net