diff --git a/squid-5.7.tar.xz b/squid-5.7.tar.xz
deleted file mode 100644
index bff5807..0000000
--- a/squid-5.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
-size 2566560
diff --git a/squid-5.7.tar.xz.asc b/squid-5.7.tar.xz.asc
deleted file mode 100644
index 3e6e225..0000000
--- a/squid-5.7.tar.xz.asc
+++ /dev/null
@@ -1,25 +0,0 @@
-File: squid-5.7.tar.xz
-Date: Mon 05 Sep 2022 16:01:50 UTC
-Size: 2566560
-MD5 : 7a3764a3c5833631a779d7827901cda7
-SHA1: 141e8007d6b1cfee34654127a9ca025125b37b58
-Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
-            B068 84ED B779 C89B 044E  64E3 CD6D BF8E F3B1 7D3E
-      keyring = http://www.squid-cache.org/pgp.asc
-      keyserver = pool.sks-keyservers.net
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmMWHXYACgkQzW2/jvOx
-fT42RQ/8CMrgBaIcdZpH9LkNffk5duDYOn2qrYmOdqkHtzN4eYRNr7Z9W03TlLum
-bRbcGtunFIyHl2ASdDX9yM1pzu7gFa5PLUeT3bqaA8F+SbryYb4jju/uIDFUB6Sl
-lqiXR7d4a4enAvrOL0xaQ0v88Z9OSVYe/NjQl28Z4EdChTkErQLitNah7GuoybyK
-ZA7aGdf7eHDNHNnE9lmYkVHc2w4iDJ9UJTNhVLvmc9x68D3nP8QwuA31mSyUimRl
-eO5jqpIbEbwTs21z/oBj7NhpNJEMcisLKUNlYZqbhBCTU4Oa28d/SxVEiAvGH4o7
-PygujqtgJU3TBoCmvFI408LQirw5p/ZfGEpn7JwkRxvDI6ppX7E5+WrZidL+Vf/8
-xMIPFAwqs/wxbsCOs3A614SwzDDbPYjEDP5ufz5n+MEz6gVU07G8WUxo5MZ7Bjvd
-AA+NI1eLA+2gmTB0aINwCNhawQwdoWyiP2i4S2qpso5AYS2n+ndOoPd1N56Jqd9H
-9NvLINLx1IyRkzmsO/3a/pAOOQPzhNz2nmgHxvM/O6trfHsUHpFXICy+mrY+Lk1Y
-MskFlh9UHZ1hyBuwkx6/SqMGmzvj4lzN3cfDzwramA6Z/BU8ner7aKQMD8ToxwME
-Kup27VTLo8yNIGB95ZOG82Q/hv5pGFbxJigQH1/ls3QvHyH0doo=
-=YG5Z
------END PGP SIGNATURE-----
diff --git a/squid-5.8.tar.xz b/squid-5.8.tar.xz
new file mode 100644
index 0000000..18e6ea8
--- /dev/null
+++ b/squid-5.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e969f8c8df569cb8646d67ee59fdbf2627beada12954c301e7c1a9c1c11734f
+size 2447560
diff --git a/squid-5.8.tar.xz.asc b/squid-5.8.tar.xz.asc
new file mode 100644
index 0000000..930fde4
--- /dev/null
+++ b/squid-5.8.tar.xz.asc
@@ -0,0 +1,25 @@
+File: squid-5.8.tar.xz
+Date: Tue 28 Feb 2023 10:17:21 UTC
+Size: 2447560
+MD5 : dfef8dc31e16ae90eb17ffcebc3e85e6
+SHA1: 5e80c1de5135b257d59bb6b7d4b8847c1569c27c
+Key : CD6DBF8EF3B17D3E <squid3@treenet.co.nz>
+            B068 84ED B779 C89B 044E  64E3 CD6D BF8E F3B1 7D3E
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = pool.sks-keyservers.net
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmP91L0ACgkQzW2/jvOx
+fT7hwA//eQjVyQzg19kBPK0WfsxgXNh8HY2os3f5fbMC0lJSXL3ONQjIHyqlbI5i
+Hew22FUMSyE5/gs8J9hUDvkAwNXNvY4JTG/Wn8lUo+jfU4PycujHuV8pwolE8P77
+Bhu64fksp2XY8hEJUinmFnA7qfK5uaiE2WJDNFQgC70aLM3WkDUR3uJ0jycFyLbC
+tHfn8WtXgHdOYdCJ+J2ZYvcIp2WWHhTHW7+7arggSwgY4wS4mgNjTCtpsiwqcNm0
+1F7m0zIk0UwRValFFGzlNGh0QZxmT31bH1FMzfppSDQ1S+CHm5sp5cfWVccUqRxs
+kuLTZvg1irjGYARboOjPTrUbcZHFTpdm8F9B/L5yAEfIDuaeuA8UZGpVRzU6KXBk
+XCu+aoDeP5eFbldZXif34r/W98jca+t4DZw4afZkOglv/3J34FnWI1/3s8D98n+/
+h8l7p+nExfeiCqGl5xNiLAxvxpijk4/Az4jPjJx1641BAGq13euvSIafZaGDGFk1
+zkuuk5jiMwwpKZlF2B6SPPhicd7eyz20BVnen1iNtInlE/mJrg4nEps5omYLNAtR
+AgNnLprV71aQevx1uGjkYMHrncx0Xn0nVjByn3WEdrE7fd8s/0wTUok6wKoW90MB
+A1MpktVvBxIscBBLsquqJD37/MOdUIOHbPk+H2A9hQJCLxdTWMw=
+=4+iG
+-----END PGP SIGNATURE-----
diff --git a/squid.changes b/squid.changes
index 524cd6e..245f2f5 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Mar 31 08:43:29 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 5.8:
+  * Bug 5162: mgr:index URL do not produce MGR_INDEX template
+  * Bug 5241: Block all non-localhost requests by default
+  * Bug 5241: Block to-localhost, to-link-local requests by
+    default
+  * ext_kerberos_ldap_group_acl: Support -b with -D
+  * Fix ACL type typo in req_header, rep_header key-changing
+    ERRORs
+  * ... and several compile fixes
+  * ... and some code cleanup and polishing
+
 -------------------------------------------------------------------
 Thu Mar 23 14:56:44 UTC 2023 - Martin Liška <mliska@suse.cz>
 
diff --git a/squid.spec b/squid.spec
index 4834a05..39d3a0d 100644
--- a/squid.spec
+++ b/squid.spec
@@ -24,7 +24,7 @@
 %define         squidhelperdir %{_sbindir}
 %endif
 Name:           squid
-Version:        5.7
+Version:        5.8
 Release:        0
 Summary:        Caching and forwarding HTTP web proxy
 License:        GPL-2.0-or-later
@@ -218,7 +218,6 @@ for i in errors/*; do
     install -m 644 $i/* %{buildroot}%{_datadir}/%{name}/$i
   fi
 done
-ln -sf %{_datadir}/%{name}/errors/en %{buildroot}%{squidconfdir}/errors
 
 # systemd
 install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service
@@ -342,7 +341,6 @@ fi
 %endif
 %config(noreplace) %{squidconfdir}/cachemgr.conf
 %config(noreplace) %{squidconfdir}/errorpage.css
-%config(noreplace) %{squidconfdir}/errors
 %if 0%{?suse_version} > 1500
 %{_distconfdir}/logrotate.d/%{name}
 %else