diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files
index 9d3970772..034310c96 100644
--- a/config/rootfiles/core/50/filelists/files
+++ b/config/rootfiles/core/50/filelists/files
@@ -3,6 +3,7 @@ var/ipfire/langs/
 etc/rc.d/init.d/console
 usr/local/sbin/setup
 var/ipfire/graphs.pl
+srv/web/ipfire/cgi-bin/portfw.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 usr/local/share/GeoIP/GeoIP.dat
 usr/share/hwdata/pci.ids
diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/core/50/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index eec3f9bf3..b325250a5 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -370,7 +370,7 @@ END
 			} else {
 			    foreach my $line (@status) {
 				if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
-				    ($line =~/ $confighash{$key}[1]\{.*INSTALLED/ ))
+				    ($line =~/$confighash{$key}[1]\{.*INSTALLED/ ))
 				    {
 				    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
 				}
diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index 5583fb88a..199682f44 100644
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -1038,7 +1038,7 @@ sub disallowreserved
 {
 	# port 67 and 68 same for tcp and udp, don't bother putting in an array
 	my $msg = "";
-	my @tcp_reserved = (81,222,444);
+	my @tcp_reserved = ();
 	my $prt = $_[0]; # the port or range
 	my $ryn = $_[1]; # tells us whether or not it is a port range
 	my $prot = $_[2]; # protocol
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 1fa40a827..177cdf4c2 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2540,7 +2540,7 @@ END
 	my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
 	foreach my $line (@status) {
 	    if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
-	       ($line =~ / $confighash{$key}[1]\{.*INSTALLED/))
+	       ($line =~ /$confighash{$key}[1]\{.*INSTALLED/))
 	    {
 		$active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>";
 	    }
diff --git a/lfs/squid b/lfs/squid
index bdc164620..ef676a2a5 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.11
+VER        = 3.1.13
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
+$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
 
 install : $(TARGET)
 
diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index c500e582e..a018289f6 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -59,9 +59,9 @@ void open_physical (char *interface, int nat_traversal_port) {
 //        safe_system(str);
         // IKE
 
-        sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
+        sprintf(str, "/sbin/iptables -D IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT >/dev/null 2>&1", interface);
         safe_system(str);
-        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --sport 500 --dport 500 -j ACCEPT", interface);
+        sprintf(str, "/sbin/iptables -A IPSECINPUT -p udp -i %s --dport 500 -j ACCEPT", interface);
         safe_system(str);
 
         if (! nat_traversal_port)