diff --git a/PLATFORMS.md b/PLATFORMS.md
index e77c57898..3ccd72c19 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -114,6 +114,7 @@
 - Garderos GRS
 - Genexis Saturn SOLT33 (telnet only)
 - Lancom LCOS SX4
+- Moxa EDS
 - MRV Communications OptiSwitch
 - MRV LX
 - Nokia/Alcatel SR-OS
@@ -254,6 +255,7 @@
 - mellanox_mlnxos
 - mikrotik_routeros
 - mikrotik_switchos
+- moxa_nos
 - mrv_lx
 - mrv_optiswitch
 - nec_ix
diff --git a/netmiko/moxa/__init__.py b/netmiko/moxa/__init__.py
new file mode 100644
index 000000000..03e711783
--- /dev/null
+++ b/netmiko/moxa/__init__.py
@@ -0,0 +1,3 @@
+from netmiko.moxa.moxa_nos import MoxaNosSSH
+
+__all__ = ["MoxaNosSSH"]
diff --git a/netmiko/moxa/moxa_nos.py b/netmiko/moxa/moxa_nos.py
new file mode 100644
index 000000000..50e7d43d1
--- /dev/null
+++ b/netmiko/moxa/moxa_nos.py
@@ -0,0 +1,23 @@
+"""
+Tested with
+
+EDS-508A
+EDS-516A
+
+Note:
+This only works in CLI mode. If the device is in Menu mode, you need to change that first.
+"""
+
+from netmiko.cisco_base_connection import CiscoSSHConnection
+
+
+class MoxaNosBase(CiscoSSHConnection):
+    """MOXA base driver"""
+
+    pass
+
+
+class MoxaNosSSH(MoxaNosBase):
+    """MOXA SSH driver"""
+
+    pass
diff --git a/netmiko/ssh_autodetect.py b/netmiko/ssh_autodetect.py
index dc3e4a33b..ec51b84aa 100644
--- a/netmiko/ssh_autodetect.py
+++ b/netmiko/ssh_autodetect.py
@@ -349,6 +349,12 @@
         "priority": 99,
         "dispatch": "_autodetect_std",
     },
+    "moxa_nos": {
+        "cmd": "",
+        "dispatch": "_autodetect_remote_version",
+        "search_patterns": [r"[Mm]oxa"],
+        "priority": 99,
+    },
     "huawei_smartax": {
         "cmd": "display version",
         "search_patterns": [r"Huawei Integrated Access Software"],
diff --git a/netmiko/ssh_dispatcher.py b/netmiko/ssh_dispatcher.py
index 5a88cd30a..294ed5db6 100644
--- a/netmiko/ssh_dispatcher.py
+++ b/netmiko/ssh_dispatcher.py
@@ -121,6 +121,7 @@
 from netmiko.mikrotik import MikrotikRouterOsSSH, MikrotikRouterOsFileTransfer
 from netmiko.mikrotik import MikrotikSwitchOsSSH
 from netmiko.mellanox import MellanoxMlnxosSSH
+from netmiko.moxa import MoxaNosSSH
 from netmiko.mrv import MrvLxSSH
 from netmiko.mrv import MrvOptiswitchSSH
 from netmiko.netapp import NetAppcDotSSH
@@ -299,6 +300,7 @@
     "mikrotik_switchos": MikrotikSwitchOsSSH,
     "mellanox": MellanoxMlnxosSSH,
     "mellanox_mlnxos": MellanoxMlnxosSSH,
+    "moxa_nos": MoxaNosSSH,
     "mrv_lx": MrvLxSSH,
     "mrv_optiswitch": MrvOptiswitchSSH,
     "nec_ix": NecIxSSH,