diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index 5f24b2ed6..ef27f383b 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -10,6 +10,8 @@ Changes in 4.2.0-Beta2
 
 5)  Allow !+setname.
 
+6)  Add macro.Mail.
+
 Changes in 4.2.0-Beta1
 
 1)  Fix handling of firewall marks.
diff --git a/Shorewall-common/macro.Mail b/Shorewall-common/macro.Mail
new file mode 100644
index 000000000..46d6cabdc
--- /dev/null
+++ b/Shorewall-common/macro.Mail
@@ -0,0 +1,19 @@
+#
+# Shorewall version 4 - Mail Macro
+#
+# /usr/share/shorewall/macro.Mail
+#
+#	This macro handles SMTP (email secure and insecure) traffic.
+#	It's the aggregate of macro.SMTP, macro.SMTPS, macro.Submission.
+#
+#	Note: This macro handles traffic between an MUA (Email client)
+#	and an MTA (mail server) or between MTAs. It does not enable
+#	reading of email via POP3 or IMAP. For those you need to use
+#	the POP3 or IMAP macros.
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	tcp	25
+PARAM	-	-	tcp	465
+PARAM	-	-	tcp	587
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index c255c31e8..09313298b 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -137,6 +137,9 @@ Other Changes in Shoreall 4.2.0 Beta 2.
    See http://www.shorewall.net/traffic_shaping.htm for an example.
 
 3) DYNAMIC_ZONES=Yes is no longer supported by Shorewall-perl.
+
+4) Farkas Levante has contributed a macro.Mail macro that covers SMTP,
+   SMTPS and submission. 
     
 None.