diff --git a/srcpkgs/whowatch/template b/srcpkgs/whowatch/template
index a57305edff4..eb040062cff 100644
--- a/srcpkgs/whowatch/template
+++ b/srcpkgs/whowatch/template
@@ -1,16 +1,22 @@
 # Template file for 'whowatch'
 pkgname=whowatch
-version=1.8.5
-revision=2
+version=1.8.6
+revision=1
+wrksrc="whowatch-whowatch-${version}"
 build_style=gnu-configure
+hostmakedepends="automake"
 makedepends="ncurses-devel"
-short_desc="Displays information about the users currently logged on to the machine in real time"
+short_desc="Displays information about the users currently logged on in real time"
 maintainer="Jan S. <jan.schreib@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 disable_parallel_build="yes"
 homepage="http://wizard.ae.krakow.pl/~mike/#whowatch"
-distfiles="http://wizard.ae.krakow.pl/~mike/download/$pkgname-$version.tar.gz"
-checksum=5e77107c2bd31eee5609d80caf3f07fb4b913b4b2e71c1d0e73204937ffc9c8a
+distfiles="https://github.com/mtsuszycki/whowatch/archive/whowatch-${version}.tar.gz"
+checksum=1b8d54e3de4d8325c47a0fb8765cbaaeee8744359b5dacd4bdb3e40b4e31797e
+
+pre_configure() {
+	autoreconf -fi
+}
 
 post_configure() {
 	echo "#define RETURN_TV_IN_SELECT 1" >> src/config.h