diff --git a/Shorewall/firewall b/Shorewall/firewall
index c847be05c..33d35a3d8 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -554,11 +554,11 @@ determine_zones()
 
 	if [ -n "$new_zone_file" ]; then
 	    case ${type:=ipv4} in
-		ipv4|plain|-)
+		ipv4|IPv4|IPV4|plain|-)
 		    list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
 		    merge_zone
 		    ;;
-		ipsec)
+		ipsec|IPSEC|ipsec4|IPSEC4)
 		    list_search $zone $ZONES $FW && startup_error "Zone $zone is defined more than once"
 		    [ -n "$POLICY_MATCH" ] || fatal_error "Your kernel and/or iptables does not support policy match"
 		    eval ${zone}_is_ipsec=Yes
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index e05c93696..9f60bd6db 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -16,6 +16,10 @@ New Features in 2.5.7:
 1) The output of "shorewall dump" now includes a capabilities report
    such as the one produced by "shorewall show capabilities".
 
+2) The "plain" zone type has been replaced by "ipv4". The types
+   "IPv4" and "IPV4" are synonyms for "ipv4". In addition, "IPSEC",
+   "ipsec4" and "IPSEC4" are recognized synonyms for "ipsec".
+
 Migration Considerations:
 
 1) The "monitor" command has been eliminated.