diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index b03562be7..c8272f626 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -39,3 +39,5 @@ Changes since 1.3.11
 17. General Cleanup for Release
 
 18. Release changes and add init, start, stop and stopped files.
+
+19. Add headings to NAT and Mangle tables in "shorewall status" output
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index a8ca59a25..0245eb4ae 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -702,8 +702,12 @@ case "$1" in
 	echo
 	packet_log 20
 	echo
+	echo "NAT Table"
+	echo
 	iptables -t nat -L -n -v
 	echo
+	echo "Mangle Table"
+	echo
 	iptables -t mangle -L -n -v
 	echo
 	cat /proc/net/ip_conntrack