diff --git a/doc/source/library/pymodbus.repl.client.rst b/doc/source/library/pymodbus.repl.client.rst
new file mode 100644
index 000000000..0597df5c1
--- /dev/null
+++ b/doc/source/library/pymodbus.repl.client.rst
@@ -0,0 +1,45 @@
+pymodbus\.repl\.client package
+=================================
+
+.. automodule:: pymodbus.repl.client
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Submodules
+-------------
+
+pymodbus\.repl\.client.completer module
+------------------------------------------
+
+.. automodule:: pymodbus.repl.client.completer
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.repl\.client.helper module
+---------------------------------------
+
+.. automodule:: pymodbus.repl.client.helper
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+pymodbus\.repl\.client\.main module
+--------------------------------------
+
+.. automodule:: pymodbus.repl.client.main
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+pymodbus\.repl\.client\.mclient module
+-----------------------------------------
+
+.. automodule:: pymodbus.repl.client.mclient
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/library/pymodbus.repl.rst b/doc/source/library/pymodbus.repl.rst
index a5bdba686..4560912f9 100644
--- a/doc/source/library/pymodbus.repl.rst
+++ b/doc/source/library/pymodbus.repl.rst
@@ -7,38 +7,10 @@ pymodbus\.repl package
     :show-inheritance:
 
 
-Submodules
-----------
+Subpackages
+--------------
 
-pymodbus\.repl\.client module
------------------------------------
+.. toctree::
 
-.. automodule:: pymodbus.repl.client
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-pymodbus\.repl\.completer module
------------------------------------
-
-.. automodule:: pymodbus.repl.completer
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-pymodbus\.repl\.helper module
------------------------------------
-
-.. automodule:: pymodbus.repl.helper
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-pymodbus\.repl\.main module
------------------------------------
-
-.. automodule:: pymodbus.repl.main
-    :members:
-    :undoc-members:
-    :show-inheritance:
+    pymodbus.repl.client
+    pymodbus.repl.server
diff --git a/doc/source/library/pymodbus.repl.server.rst b/doc/source/library/pymodbus.repl.server.rst
new file mode 100644
index 000000000..d927b6eab
--- /dev/null
+++ b/doc/source/library/pymodbus.repl.server.rst
@@ -0,0 +1,27 @@
+pymodbus\.repl.\.server package
+==================================
+
+.. automodule:: pymodbus.repl.server
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Submodules
+-------------
+
+pymodbus\.repl\.server\.cli module
+-------------------------------------
+
+.. automodule:: pymodbus.repl.server.cli
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+pymodbus\.repl\.server\.main module
+--------------------------------------
+
+.. automodule:: pymodbus.repl.server.main
+    :members:
+    :undoc-members:
+    :show-inheritance: