diff --git a/Shorewall/Macros/macro.SNMP b/Shorewall/Macros/macro.SNMP
index ecbeb9ec3..9d35df9e5 100644
--- a/Shorewall/Macros/macro.SNMP
+++ b/Shorewall/Macros/macro.SNMP
@@ -3,9 +3,9 @@
 #
 # /usr/share/shorewall/macro.SNMP
 #
-#	This macro handles SNMP traffic (including traps).
+#	This macro handles SNMP traffic.
 #
-#       Note that traps are passed from DEST to SOURCE.
+#       Note: To allow SNMP Traps, use the SNMPTrap macro
 #
 ###############################################################################
 FORMAT 2
@@ -17,5 +17,3 @@ FORMAT 2
 ?else
  PARAM	-	-	udp	161
 ?endif
-
-PARAM	DEST	SOURCE	tcp	162
diff --git a/Shorewall/Macros/macro.SNMPTrap b/Shorewall/Macros/macro.SNMPTrap
new file mode 100644
index 000000000..cefc1efc0
--- /dev/null
+++ b/Shorewall/Macros/macro.SNMPTrap
@@ -0,0 +1,12 @@
+#
+# Shorewall version 4 - SNMP Trap Macro
+#
+# /usr/share/shorewall/macro.SNMP
+#
+#	This macro handles SNMP traps.
+#
+###############################################################################
+FORMAT 2
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	udp	162