diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 5f2bdb77809..aeda59e11d7 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
 # Template file for 'squid'
 pkgname=squid
-version=3.5.7
-revision=3
+version=3.5.8
+revision=1
 build_style=gnu-configure
 configure_args="
  --sbindir=/usr/bin
@@ -16,8 +16,8 @@ configure_args="
  --enable-auth-ntlm
  --enable-auth-digest
  --enable-auth-negotiate
- --enable-removal-policies="lru,heap"
- --enable-storeio="aufs,ufs,diskd"
+ --enable-removal-policies=lru,heap
+ --enable-storeio=aufs,ufs,diskd
  --enable-delay-pools
  --enable-arp-acl
  --with-openssl=/usr
@@ -57,8 +57,8 @@ short_desc="Caching proxy for the Web"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="GPL-2"
 homepage="http://www.squid-cache.org/"
-distfiles="http://www.squid-cache.org/Versions/v${version%%.*}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=b7dcec8c5cb7f5687aff4256a7522f670c310a350cc9e9c0f29f3fd9cf88d017
+distfiles="ftp://ftp.fu-berlin.de/unix/www/${pkgname}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62
 nocross=yes
 
 post_install() {