diff --git a/squid-3.5.19.tar.xz b/squid-3.5.19.tar.xz
deleted file mode 100644
index 89c39bd..0000000
--- a/squid-3.5.19.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4b8a2efb85acc600e506605f175298ce3324048e60f4708926d354fe4b5c7a0
-size 2318720
diff --git a/squid-3.5.19.tar.xz.asc b/squid-3.5.19.tar.xz.asc
deleted file mode 100644
index a71c8fe..0000000
--- a/squid-3.5.19.tar.xz.asc
+++ /dev/null
@@ -1,20 +0,0 @@
-File: squid-3.5.19.tar.xz
-Date: Sun May  8 14:25:45 UTC 2016
-Size: 2318720
-MD5 : a1d990284c429a63ee85d80ee5b3b8b9
-SHA1: 809133b751df9fb5bca07f181b3e2f7df392f761
-Key : 0xFF5CF463 <squid3@treenet.co.nz>
-      fingerprint = EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
-      keyring = http://www.squid-cache.org/pgp.asc
-      keyserver = subkeys.pgp.net
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJXL0zWAAoJELJo5wb/XPRjTFMH/A09rmkzxYmNOSCNCRDU5OAR
-GaKfWWhmg9zTz9F6KE4XQyEm2SLwjJguZXGipgEeGv3b7z6xhZt9boKvzP+F7izt
-42v6vGY63VAhmHfL6Ub2SKKzryzEjkItzuk/N5qB2bTUk4U7xlIvToLjemSMPuB0
-RsIsL9W54Szz8Bh/ixKBKUX3SSJlE7/aVyW8SPFPSSWmlK33EX/VE5Mkxsi9T/WZ
-l8FlaeQgrUP8LA+5XW86mEYl7m2YNdFJlMPDgkVwBYaeyAv7FkvGbaLnxxBm40MN
-/wD3/2rotdvbxROpCfS7jih8D8oMS/DuBFNnfVMCcKWL7/+fXmqBlqHvXBFu0xg=
-=/l9z
------END PGP SIGNATURE-----
diff --git a/squid-3.5.20.tar.xz b/squid-3.5.20.tar.xz
new file mode 100644
index 0000000..f38e2c8
--- /dev/null
+++ b/squid-3.5.20.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37db73bd33ddd3503fe375bc3f2b47d9fb7309042e439ad3651f21d5dcf2d395
+size 2319780
diff --git a/squid-3.5.20.tar.xz.asc b/squid-3.5.20.tar.xz.asc
new file mode 100644
index 0000000..d5020ed
--- /dev/null
+++ b/squid-3.5.20.tar.xz.asc
@@ -0,0 +1,20 @@
+File: squid-3.5.20.tar.xz
+Date: Fri Jul  1 13:49:42 UTC 2016
+Size: 2319780
+MD5 : 48fb18679a30606de98882528beab3a7
+SHA1: 2bb6d3568e7167c9b99fea092a97287d0e430863
+Key : 0xFF5CF463 <squid3@treenet.co.nz>
+      fingerprint = EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = subkeys.pgp.net
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJXdnW5AAoJELJo5wb/XPRjqzsH+wXT0yt47aqoGWI8D1YpRaW5
+KPYvJdos0zPfgIPFWXxngH+ZpJcSPD21QuiEPS8BqISxm+/+By+0QIljITnHWFOV
+/wo1nwL/IMissmD+9bksyBede+BsZdz1PSwl9V1MzvuGL4vwOC0UZD9RT9RYvMwj
+Exfw80v/01bAVpV8U3tsBodk4Rz3AWIHhH2Tf9O2EZ/pIAtEHtDbkdLk81rSwNED
+tL6yV/n+BoWgAPg/+YPVGRK/h5nD4tBkTD6YBCnxp5PJmybhvAjLr/J96PtPpHdC
+or7Vx1lVpKvkXwZjn936+v4pqv19lsvKs5zLtGKBG2wMmoSIo2bf/bGhhT5kBDc=
+=znHp
+-----END PGP SIGNATURE-----
diff --git a/squid-config.patch b/squid-config.patch
index bff9cfb..98b48c8 100644
--- a/squid-config.patch
+++ b/squid-config.patch
@@ -11,7 +11,7 @@ Index: src/cf.data.pre
  http_access allow localhost
  
  # And finally deny all other access to this proxy
-@@ -3761,6 +3763,10 @@ DOC_START
+@@ -3769,6 +3771,10 @@ DOC_START
  	Instead, if you want Squid to use the entire disk drive,
  	subtract 20% and use that value.
  
@@ -22,7 +22,7 @@ Index: src/cf.data.pre
  	'L1' is the number of first-level subdirectories which
  	will be created under the 'Directory'.  The default is 16.
  
-@@ -3879,7 +3885,7 @@ DOC_START
+@@ -3887,7 +3893,7 @@ DOC_START
  NOCOMMENT_START
  
  # Uncomment and adjust the following to add a disk cache directory.
@@ -31,7 +31,7 @@ Index: src/cf.data.pre
  NOCOMMENT_END
  DOC_END
  
-@@ -4576,7 +4582,7 @@ DOC_END
+@@ -4584,7 +4590,7 @@ DOC_END
  
  NAME: logfile_rotate
  TYPE: int
diff --git a/squid.changes b/squid.changes
index 07d6a1f..10b2cd5 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Jul 10 07:49:53 UTC 2016 - mpluskal@suse.com
+
+- Update to version 3.5.20:
+  * Assertion failed: Write.cc:38: "fd_table[conn->fd].flags.open"
+  * Bug #4523: smblib compile fails on NetBSD
+  * Do not make bogus recvmsg(2) calls when closing UDS sockets.
+  * Fix SEGFAULT parsing malformed adaptation service configuration
+  * Fixed ConnStateData::In::maybeMakeSpaceAvailable() logic.
+  * Bug #3579: assertion failed 'MemPools[type]' from dst_as ACL
+  * SourceFormat Enforcement
+  * Do not allow low-level debugging to hide important/critical 
+    messages.
+  * Bug #4485: off-by-one out-of-bounds Parser::Tokenizer::int64() 
+    read errors
+  * Increase debug level in a peek-and-splice related debug message
+  * Fix icons loading speed.
+  * Fix OpenSSL detection on FreeBSD
+  * Do not override user defined -std option
+  * SourceFormat Enforcement
+  * Support unified EUI format code in external_acl_type
+
 -------------------------------------------------------------------
 Mon May  9 08:50:11 UTC 2016 - hpj@urpla.net
 
diff --git a/squid.spec b/squid.spec
index 52e2a12..7e86ce6 100644
--- a/squid.spec
+++ b/squid.spec
@@ -20,7 +20,7 @@
 %define         squidconfdir %{_sysconfdir}/squid
 
 Name:           squid
-Version:        3.5.19
+Version:        3.5.20
 Release:        0
 Summary:        A fully featured HTTP/1.0 proxy
 License:        GPL-2.0+
@@ -142,7 +142,7 @@ chmod a-x CREDITS
 %build
 export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
 export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
-export LDFLAGS='-Wl,-z,relro,-z,now -pie'
+export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro,-z,now -pie"
 %configure \
 	--disable-strict-error-checking \
 	--sysconfdir=%{squidconfdir} \