diff --git a/ceph.spec.in b/ceph.spec.in
index 82295884696..39c3bade79f 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -2317,6 +2317,7 @@ fi
 %files -n cephfs-shell
 %{python3_sitelib}/cephfs_shell-*.egg-info
 %{_bindir}/cephfs-shell
+%{_mandir}/man8/cephfs-shell.8*
 %endif
 
 %files -n cephfs-top
diff --git a/debian/cephfs-shell.install b/debian/cephfs-shell.install
index 4713a81b115..ee9e1399ff8 100644
--- a/debian/cephfs-shell.install
+++ b/debian/cephfs-shell.install
@@ -1,2 +1,3 @@
 usr/bin/cephfs-shell
 usr/lib/python3*/dist-packages/cephfs_shell-*.egg-info
+usr/share/man/man8/cephfs-shell.8
diff --git a/doc/cephfs/index.rst b/doc/cephfs/index.rst
index 02ae3e9b293..b3de0f268aa 100644
--- a/doc/cephfs/index.rst
+++ b/doc/cephfs/index.rst
@@ -115,7 +115,7 @@ Mounting CephFS
     Mount CephFS using Kernel Driver <mount-using-kernel-driver>
     Mount CephFS using FUSE <mount-using-fuse>
     Mount CephFS on Windows <ceph-dokan>
-    Use the CephFS Shell <cephfs-shell>
+    Use the CephFS Shell <../../man/8/cephfs-shell>
     Supported Features of Kernel Driver <kernel-features>
     Manual: ceph-fuse <../../man/8/ceph-fuse>
     Manual: mount.ceph <../../man/8/mount.ceph>
diff --git a/doc/man/8/CMakeLists.txt b/doc/man/8/CMakeLists.txt
index 8e1b9373fc8..e020f347801 100644
--- a/doc/man/8/CMakeLists.txt
+++ b/doc/man/8/CMakeLists.txt
@@ -38,6 +38,7 @@ list(APPEND man_srcs
   ${osd_srcs}
   ${mon_srcs}
   ceph-mds.rst
+  cephfs-shell.rst
   cephfs-top.rst
   librados-config.rst
   cephadm.rst
diff --git a/doc/cephfs/cephfs-shell.rst b/doc/man/8/cephfs-shell.rst
similarity index 100%
rename from doc/cephfs/cephfs-shell.rst
rename to doc/man/8/cephfs-shell.rst
diff --git a/doc/man_index.rst b/doc/man_index.rst
index 30ab1c3eba7..d89cac2d310 100644
--- a/doc/man_index.rst
+++ b/doc/man_index.rst
@@ -25,6 +25,7 @@
    man/8/cephadm
    man/8/cephfs-top
    man/8/cephfs-mirror
+   man/8/cephfs-shell
    man/8/crushtool
    man/8/librados-config
    man/8/monmaptool