diff --git a/PLATFORMS.md b/PLATFORMS.md
index e77c57898..0bb06f549 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -75,45 +75,48 @@
 
 ###### Experimental
 
+- 6WIND TurboRouter
 - A10
 - Accedian
 - Alaxala AX2600S and AX3600S 
 - Allied Telesis AlliedWare Plus
 - Arris CER
-- Aruba OS (Wireless Controllers/WAPs)
 - Aruba AOS-CX
+- Aruba OS (Wireless Controllers/WAPs)
 - AsterFusion AsterNOS SONiC
 - Bintec BOSS (Bintec/Funkwerk)
 - Brocade Fabric OS
 - C-DOT CROS
+- Check Point GAiA
 - Ciena SAOS
 - Ciena SAOS10
 - Ciena Waveserver
-- Citrix Netscaler
 - Cisco APIC (Linux)
 - Cisco Telepresence
 - Cisco Viptela
+- Citrix Netscaler
 - Corelight Linux
 - Coriant
 - Cumulus VX Linux
-- Dell OS6
 - Dell EMC Isilon
+- Dell OS6
 - Digi TransPort Routers
 - Edgecore SONiC
 - Eltex
-- Enterasys
 - Endace
+- Enterasys
 - Extreme EXOS
-- Extreme Wing
 - Extreme SLX (Brocade)
-- F5 TMSH
+- Extreme Wing
 - F5 Linux
-- Fiberstore NetworkOS
+- F5 TMSH
 - Fiberstore FS-OS (V2)
+- Fiberstore NetworkOS
 - Fortinet
 - Garderos GRS
 - Genexis Saturn SOLT33 (telnet only)
 - Lancom LCOS SX4
+- Moxa EDS
 - MRV Communications OptiSwitch
 - MRV LX
 - Nokia/Alcatel SR-OS
@@ -131,7 +134,6 @@
 - Vertiv MPH Power Distribution Units
 - Watchguard Firebox
 - Zyxel NOS
-- 6WIND TurboRouter
 
 ###### Supported SSH device_type values
 
@@ -254,6 +256,7 @@
 - mellanox_mlnxos
 - mikrotik_routeros
 - mikrotik_switchos
+- moxa
 - mrv_lx
 - mrv_optiswitch
 - nec_ix
diff --git a/netmiko/moxa/__init__.py b/netmiko/moxa/__init__.py
new file mode 100644
index 000000000..41bbda56d
--- /dev/null
+++ b/netmiko/moxa/__init__.py
@@ -0,0 +1,3 @@
+from netmiko.moxa.moxa import MoxaSSH
+
+__all__ = ["MoxaSSH"]
diff --git a/netmiko/moxa/moxa.py b/netmiko/moxa/moxa.py
new file mode 100644
index 000000000..210c6509d
--- /dev/null
+++ b/netmiko/moxa/moxa.py
@@ -0,0 +1,13 @@
+from netmiko.cisco_base_connection import CiscoSSHConnection
+
+
+class MoxaBase(CiscoSSHConnection):
+    """MOXA base driver"""
+
+    pass
+
+
+class MoxaSSH(MoxaBase):
+    """MOXA SSH driver"""
+
+    pass
diff --git a/netmiko/ssh_autodetect.py b/netmiko/ssh_autodetect.py
index dc3e4a33b..87de85163 100644
--- a/netmiko/ssh_autodetect.py
+++ b/netmiko/ssh_autodetect.py
@@ -349,6 +349,12 @@
         "priority": 99,
         "dispatch": "_autodetect_std",
     },
+    "moxa": {
+        "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..7a46d346a 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 MoxaSSH
 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": MoxaSSH,
     "mrv_lx": MrvLxSSH,
     "mrv_optiswitch": MrvOptiswitchSSH,
     "nec_ix": NecIxSSH,