diff --git a/srcpkgs/varnish/patches/musl.patch b/srcpkgs/varnish/patches/musl.patch
new file mode 100644
index 0000000000..a417c31904
--- /dev/null
+++ b/srcpkgs/varnish/patches/musl.patch
@@ -0,0 +1,22 @@
+--- include/vpf.h	2016-03-03 14:40:01.000000000 +0100
++++ include/vpf.h	2018-01-11 11:45:26.521900821 +0100
+@@ -30,6 +30,8 @@
+ #ifndef VPF_H_INCLUDED
+ #define VPF_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ struct vpf_fh;
+ 
+ struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr);
+--- include/vsb.h	2017-11-14 14:39:22.000000000 +0100
++++ include/vsb.h	2018-01-11 11:48:15.505912873 +0100
+@@ -31,6 +31,8 @@
+ #ifndef VSB_H_INCLUDED
+ #define VSB_H_INCLUDED
+ 
++#include <sys/types.h>
++
+ /*
+  * Structure definition
+  */
diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index af42c037c8..6f4210bd1e 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,22 +1,31 @@
 # Template file for 'varnish'
 pkgname=varnish
-version=3.0.7
-revision=6
+version=5.2.1
+revision=1
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--disable-static --sbindir=/usr/bin"
-hostmakedepends="pkg-config python"
+hostmakedepends="pkg-config python python-docutils"
 makedepends="pcre-devel readline-devel jemalloc-devel"
 conf_files="/etc/varnish/default.vcl"
 make_dirs="/var/varnish 750 nobody nogroup"
 short_desc="A fast caching HTTP reverse proxy"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Simplified BSD"
-homepage="https://www.varnish-cache.org/"
-distfiles="http://repo.varnish-cache.org/source/${pkgname}-${version}.tar.gz"
-checksum=a27e9f11391617fab27cc6edc31d3c8681b8d6975f8c2cd07f6e081bc54c24ce
+homepage="https://varnish-cache.org/"
+distfiles="http://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
+checksum=b8452c9d78c16f78c8cfd1c1a1e696523bf64b7721c330150dcc0852459014b3
+
+nocross="Cannot run test program when cross compiling (PCRE_JIT)"
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel"
+		broken="Segfaults when running ../../bin/varnishd/varnishd -x cli > include/cli.rst"
+		;;
+esac
 
 post_install() {
+	vinstall etc/example.vcl 644 etc/varnish default.vcl
 	vsv varnishd
 }