diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 2ed1e52cd..5d93733d1 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -28,4 +28,7 @@ Changes since 1.3.11
 
 13. Added "shorewall show classifiers" command and added packet
     classification filter display to "shorewall monitor"
+
+14. Added an error message when the destination in a rule contained a
+    MAC address.
  
diff --git a/Shorewall/firewall b/Shorewall/firewall
index d7c029ea8..3033c3b39 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -708,7 +708,7 @@ validate_rule() {
 		serv=$server
 		;;
 	    ~*)
-		fatal_error "Error: Rule \"$rule\" - Server may not be specified by MAC Address"
+		startup_error "Error: Rule \"$rule\" - Destination may not be specified by MAC Address"
 		;;
 	    *)
 		dest_interface="-o $server"
@@ -2027,6 +2027,9 @@ add_a_rule()
     *.*.*)
 	serv=$server
 	;;
+    ~*)
+	fatal_error "Error: Rule \"$rule\" - Destination may not be specified by MAC Address"
+	;;
     *)
 	dest_interface="-o $server"
 	serv=