diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index ead43ac31..a4284c713 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -31,3 +31,8 @@ Change in 2.0.6
 3) Don't give shorewall.conf and zones execute permission.
   
 4) Backport 'dropInvalid' from 2.1
+
+Changes in 2.0.7
+
+1) Include output of "ip rule ls" and "ip route ls" in "shorewall
+   status".
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index f2496bad2..15cdc806c 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.0.6
+Shorewall 2.0.7
 
 ----------------------------------------------------------------------
 Problems Corrected in version 2.0.4
@@ -38,5 +38,11 @@ Problems Corrected in version 2.0.6
 3) ICMP packets that are in the INVALID state are now dropped by the
    Reject and Drop default actions. They do so using the new 
    'dropInvalid' builtin action.
+-----------------------------------------------------------------------
+Problems Corrected in version 2.0.7
+
+1) To improve supportability, the "shorewall status" command now
+   includes the output from "ip rule ls" and "ip addr ls".
+
 
 
diff --git a/STABLE2/shorewall b/STABLE2/shorewall
index cc75ed19d..ca0363879 100755
--- a/STABLE2/shorewall
+++ b/STABLE2/shorewall
@@ -881,6 +881,16 @@ case "$1" in
 	iptables -t mangle -L $IPT_OPTIONS
 	echo
 	cat /proc/net/ip_conntrack
+	echo
+	echo "IP Configuration"
+	echo
+	ip addr ls
+	echo
+	echo "Routing"
+	echo
+	ip rule ls
+	echo
+	ip route ls
 	;;
     hits)
     	[ -n "$debugging" ] && set -x