diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 7e7a6d4aa..bfa30c7dc 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,3 +1,9 @@
+Changes in 2.5.5
+
+1) Zone file alchemy attempted.
+
+2) Fix install.sh re: Makefile
+
 Changes in 2.5.4
 
 1) Allow TAG to be used as a general parameter mechanism [hack].
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index c2134c4fe..735d8c3fe 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -537,7 +537,7 @@ if [ ! -f ${PREFIX}/etc/shorewall/actions ]; then
 fi
 
 if [ ! -f ${PREFIX}/etc/shorewall/Makefile ]; then
-    run_install $OWNERSHIP -m 0600 actions ${PREFIX}/etc/shorewall/Makefile
+    run_install $OWNERSHIP -m 0600 Makefile ${PREFIX}/etc/shorewall/Makefile
     echo
     echo "Makefile installed as ${PREFIX}/etc/shorewall/Makefile"
 fi
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 9c3466ea8..3ef70cbbd 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -1,44 +1,22 @@
-Shorewall 2.5.4
+Shorewall 2.5.5.
+
+Problems Corrected in 2.5.5:
+
+1)  The install script now installs the correct Makefile. Previously,
+    the /etc/shorewall/actions file was identical to the Makefile.
+
+2)  The IPSEC column in /etc/shorewall/zones has been renamed TYPE and
+    can have one of the following values:
+
+    plain, -, or <empty>	  A normal zone
+    ipsec			  An IPSEC zone
+    firewall			  The firewall zone. There must be
+				  exactly one firewall zone.
 
 Problems Corrected in 2.5.4:
 
 1)  Several serious problems associated with macros have been corrected.
 
-New Features in Shorewall 2.5.4
-
-1)  Shorewall actions lack a generalized way to pass parameters to an
-    extension script associated with an action. To work around this
-    lack, some users have used the log tag as a parameter. This works
-    but requires that a log level other than 'none' be specified when
-    the action is invoked. Beginning with this release, you can invoke
-    an action with 'none'.
-
-    Example:
-
-	#ACTION				SOURCE          DEST
-	A:none:these,are,parameters   fw		net
-
-    When /etc/shorewall/A is invoked, the LEVEL variable will be empty
-    but the TAG variable will contain "these,are,parameters" which
-    can be easily parsed to isolate "these", "are" and "parameters":
-
-	ifs=$IFS
-	IFS=,
-	set -- $TAG
-	IFS=$ifs
-
-    Now, $1 = these, $2 = are and $3 = parameters
-
-2)  The "shorewall check" command now checks the /etc/shorewall/masq,
-    /etc/shorewall/blacklist, /etc/shorewall/proxyarp, 
-    /etc/shorewall/nat and /etc/shorewall/providers files.
-
-3)  Arne Bernin's "tc4shorewall" package has been integrated into
-    Shorewall. Arne will be providing documentation and support for
-    this part of Shorewall.
-
-    Thanks, Arne!
-
 Problems Corrected in 2.5.3:
 
 1)  The Netfilter 'raw' table is now cleared during "shorewall stop",
@@ -528,3 +506,13 @@ New Features in Shorewall 2.5.*
 
     Now, $1 = these, $2 = are and $3 = parameters
 
+18) The "shorewall check" command now checks the /etc/shorewall/masq,
+    /etc/shorewall/blacklist, /etc/shorewall/proxyarp, 
+    /etc/shorewall/nat and /etc/shorewall/providers files.
+
+19)  Arne Bernin's "tc4shorewall" package has been integrated into
+    Shorewall. Arne will be providing documentation and support for
+    this part of Shorewall.
+
+    Thanks, Arne!
+