diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 3acc5c04e7..f4f7af3a8f 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,8 +1,8 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.4
+version=4.8.5
 revision=1
-wrksrc="${pkgname}-${pkgname}-${version}"
+wrksrc="${pkgname}-Z3-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
 make_build_args="-C build all examples"
@@ -15,8 +15,8 @@ short_desc="Z3 theorem prover and SMT solver (command line + Python3 module)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
-distfiles="https://github.com/Z3Prover/z3/archive/${pkgname}-${version}.tar.gz"
-checksum=5a18fe616c2a30b56e5b2f5b9f03f405cdf2435711517ff70b076a01396ef601
+distfiles="https://github.com/Z3Prover/z3/archive/Z3-${version}.tar.gz"
+checksum=4e8e232887ddfa643adb6a30dcd3743cb2fa6591735fbd302b49f7028cdc0363
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"