diff --git a/Shorewall/Macros/macro.BGP b/Shorewall/Macros/macro.BGP
index 302a6c8f7..a1fd38ec0 100644
--- a/Shorewall/Macros/macro.BGP
+++ b/Shorewall/Macros/macro.BGP
@@ -3,11 +3,10 @@
 #
 # /usr/share/shorewall/macro.BGP
 #
-#       This macro handles BGP4 traffic and access to the quagga bgpd vty.
+#       This macro handles BGP4 traffic.
 #
 ###############################################################################
 #ACTION SOURCE  DEST    PROTO   DEST    SOURCE  RATE    USER/
 #                               PORT(S) PORT(S) LIMIT   GROUP
 PARAM   -       -       tcp     179     				# BGP4
-PARAM   -       -       tcp     2605    				# bgpd
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/Macros/macro.IPPbrd b/Shorewall/Macros/macro.IPPbrd
index 471886784..643b5cb96 100644
--- a/Shorewall/Macros/macro.IPPbrd
+++ b/Shorewall/Macros/macro.IPPbrd
@@ -1,6 +1,11 @@
 #
-# Shorewall Macro - IPP broadcasts
+# Shorewall version 4 - IPP Broadcast Macro
 #
+# /usr/share/shorewall/macro.IPPbrd
+#
+#	This macro handles Internet Printing Protocol (IPP) broadcasts.
+#       If you also need to handle TCP 631 connections in the opposite
+#       direction, use the IPPserver Macro
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
 #				PORT(S)	PORT(S)	LIMIT	GROUP
diff --git a/Shorewall/Macros/macro.IPPserver b/Shorewall/Macros/macro.IPPserver
index cd91202c9..b768dd140 100644
--- a/Shorewall/Macros/macro.IPPserver
+++ b/Shorewall/Macros/macro.IPPserver
@@ -1,5 +1,5 @@
 #
-# Shorewall version 3.2 - IPPserver Macro
+# Shorewall version 4 - IPPserver Macro
 #
 # /usr/share/shorewall/macro.IPPserver
 #
diff --git a/Shorewall/Macros/macro.NTPbi b/Shorewall/Macros/macro.NTPbi
index ac7ee0efb..8536f0fd4 100644
--- a/Shorewall/Macros/macro.NTPbi
+++ b/Shorewall/Macros/macro.NTPbi
@@ -1,5 +1,9 @@
 #
-# Shorewall Macro - bi-directional NTP (for NTP peers)
+# Shorewall version 4 - NTPbi Macro
+#
+# /usr/share/shorewall/macro.NTPbi
+#
+#        This macro handles  bi-directional NTP (for NTP peers)
 #
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
diff --git a/Shorewall/Macros/macro.OSPF b/Shorewall/Macros/macro.OSPF
index 7897bec2d..84e2fdbbf 100644
--- a/Shorewall/Macros/macro.OSPF
+++ b/Shorewall/Macros/macro.OSPF
@@ -3,12 +3,10 @@
 #
 # /usr/share/shorewall/macro.OSPF
 #
-#       This macro handles OSPF multicast traffic and access
-#       to the Quagga ospfd.
+#       This macro handles OSPF multicast traffic
 #
 #######################################################################################################
 #ACTION         SOURCE          DEST    PROTO   DEST    SOURCE  ORIGINAL        RATE    USER/   ORIGINAL
 #                                               PORT(S) PORT(S) DEST            LIMIT   GROUP   DEST
 PARAM           -               -       89      -                                                       # OSPF
-PARAM           -               -       tcp     2604                                                    # ospfd
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/Macros/macro.RIPbi b/Shorewall/Macros/macro.RIPbi
index 92c8e6c12..fbfde033d 100644
--- a/Shorewall/Macros/macro.RIPbi
+++ b/Shorewall/Macros/macro.RIPbi
@@ -1,5 +1,9 @@
 #
-# Shorewall Macro: RIP (Routing Information Protocol) - bidirectional
+# Shorewall version 4 - RIPbi Macro
+#
+# /usr/share/shorewall/macro.RIPbi
+#
+#        This macro handles RIP (Routing Information Protocol) - bidirectional
 #
 ###############################################################################
 #ACTION SOURCE  DEST    PROTO   DEST    SOURCE  RATE    USER/
diff --git a/Shorewall/Macros/macro.DG b/Shorewall/Macros/macro.Webcache
similarity index 69%
rename from Shorewall/Macros/macro.DG
rename to Shorewall/Macros/macro.Webcache
index f8552769f..498a6f8d6 100644
--- a/Shorewall/Macros/macro.DG
+++ b/Shorewall/Macros/macro.Webcache
@@ -1,10 +1,13 @@
 #
-# Shorewall Macro: Dan's Guardian (TCP 8080)
+# Shorewall version 4 - Web Cache Macro
+#
+# /usr/share/shorewall/macro.WebCache
+#
+#	This macro handles Web Caches and Dan't Guardian
 #
 ###############################################################################
 #ACTION SOURCE  DEST    PROTO   DEST    SOURCE  RATE    USER/
 #                               PORT(S) PORT(S) LIMIT   GROUP
 PARAM   -       -       tcp	8080
-PARAM	DEST	SOURCE	tcp	-	8080	# late replies
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
 
diff --git a/Shorewall/Macros/macro.mDNS b/Shorewall/Macros/macro.mDNS
index 7f194b615..5a6bc81ff 100644
--- a/Shorewall/Macros/macro.mDNS
+++ b/Shorewall/Macros/macro.mDNS
@@ -1,5 +1,9 @@
 #
-# Shorewall Macro - multicast DNS (bidirectional)
+# Shorewall version 4 - Multicast DNS Macro
+#
+# /usr/share/shorewall/macro.DNS
+#
+#	This macro handles multicast DNS traffic.
 #
 ###############################################################################
 #ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 1caf283de..c24660b25 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -133,7 +133,7 @@ None.
 
 2)  Paul Gear has contributed the following macros:
 
-    	 macro.DG
+    	 macro.Webcache
  	 macro.IPPbrd
  	 macro.NTPbi
  	 macro.RIPbi
diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm
index a33db488c..b75428251 100644
--- a/web/shorewall_index.htm
+++ b/web/shorewall_index.htm
@@ -47,7 +47,7 @@
     </tr>
   </tbody>
 </table>
-<hr style="width: 100%; height: 2px;"><span style="font-weight: bold;">2009-06-20</span><br>
+<hr style="width: 100%; height: 2px;"><span style="font-weight: bold;">2009-06-30</span><br>
 <h3><a href="Notices.html#Shell-EOL">Attention Shorewall-shell users</a><br>
 </h3>
 <h3><a name="Releases"></a>Current Shorewall Releases</h3>
@@ -93,14 +93,14 @@ Release</span><br>
       </div>
       </td>
       <td style="vertical-align: top;"><span style="font-weight: bold;">4.4.0
-Beta 2</span><br>
+Beta 3</span><br>
       </td>
       <td style="vertical-align: top;"><a
- href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-Beta2/releasenotes.txt">Release
+ href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-Beta3/releasenotes.txt">Release
 Notes<br>
       </a> </td>
       <td style="vertical-align: top;"><a
- href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-Beta2/known_problems.txt">Known
+ href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-Beta3/known_problems.txt">Known
 Problems</a> </td>
     </tr>
   </tbody>