diff --git a/network/enumeration/smtp-commands-enum.yaml b/network/enumeration/smtp-commands-enum.yaml
new file mode 100644
index 0000000000..6c1cc5e509
--- /dev/null
+++ b/network/enumeration/smtp-commands-enum.yaml
@@ -0,0 +1,39 @@
+id: smtp-commands-enum
+
+info:
+  name: SMTP Commands Enumeration
+  author: pussycat0x
+  severity: info
+  description: |
+    Attempts to use EHLO and HELP to gather the Extended commands supported by an SMTP server.
+  reference:
+    - https://nmap.org/nsedoc/scripts/smtp-commands.html
+  metadata:
+    max-request: 2
+    verified: true
+    shodan-query: 'smtp'
+  tags: network,enum,smtp,mail
+
+tcp:
+  - inputs:
+      - data: "EHLO x\r\n"
+        read: 1024
+      - data: "HELP\r\n"
+        read: 1024
+
+    host:
+      - "{{Hostname}}"
+      - "{{Host}}:25"
+
+    matchers-condition: and
+    matchers:
+      - type: word
+        words:
+          - "214"
+          - "This server supports"
+        condition: and
+
+    extractors:
+      - type: regex
+        regex:
+          - '214 (.*)'
\ No newline at end of file