diff --git a/.gitignore b/.gitignore
index 789acef..e722d1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /varnish-modules-0.15.0.tar.gz
 /varnish-modules-0032ed8.tar.gz
 /varnish-modules-0.16.0.tar.gz
+/varnish-modules-4d6593c.tar.gz
diff --git a/sources b/sources
index 90bd340..7a6624f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (varnish-modules-0.16.0.tar.gz) = 614bb99cf48d33710f06ed52bacff092c8a60ddd8f5eb55470cf571e44ca01cc9696b4c8669dc6979ab7096762cb6ef80435e210aa38f9eaaf31a1dd73d858e2
+SHA512 (varnish-modules-4d6593c.tar.gz) = bb118cd844e0519db2dea0b3b4be1f3fda8760e9380537cd1e2a3ef52b2156ed51b608b02a9ce021ec25a405ffa4e5b9bbe811d6c410dab93ff1a4207f694416
diff --git a/varnish-modules.spec b/varnish-modules.spec
index 5375ef6..9d86f64 100644
--- a/varnish-modules.spec
+++ b/varnish-modules.spec
@@ -1,20 +1,23 @@
 %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
+%global commit 4d6593c2c97ecbabd3bd68203bace9cdbd6e960c
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %if 0%{?rhel} == 7 || 0%{?rhel} == 6
 %global docutils python34-docutils
+%global rst2man rst2man-3.4
 %else
 %global docutils python3-docutils
+%global rst2man rst2man
 %endif
 
 Name:    varnish-modules
-Version: 0.16.0
-Release: 3%{?dist}
+Version: 0.17.0
+Release: 0.1.klarlack.20200916git%{shortcommit}%{?dist}
 Summary: A collection of modules ("vmods") extending Varnish VCL
 
 License: BSD
-URL:     https://github.com/varnish/%{name}
-#Source:  https://download.varnish-software.com/varnish-modules/#{name}-#{version}.tar.gz
-Source:  https://github.com/varnish/varnish-modules/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+URL:     https://github.com/nigoroll/varnish-modules
+Source:  https://github.com/nigoroll/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
@@ -41,25 +44,27 @@ Provides: vmod-xkey = %{version}-%{release}
 %description
 This is a collection of modules ("vmods") extending Varnish VCL used
 for describing HTTP request/response policies with additional
-capabilities. This collection contains the following vmods (previously
-kept individually): vsthrottle, header, saintmode, softpurge,
-tcp, var, xkey
+capabilities. This collection contains the following vmods:
+bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey
 
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{commit}
 
 
 %build
+sh bootstrap
+export RST2MAN=%{rst2man}
 %configure 
-
 %make_build
 
+
 %install
 %make_install docdir=%_pkgdocdir
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro
 
+
 %check
 %ifarch %ix86 %arm ppc
 # 64-bit specific test
@@ -74,7 +79,14 @@ sed -i 's,tests/xkey/test12.vtc,,' src/Makefile
 %{_libdir}/varnish/vmods/*
 %{_mandir}/man3/*.3*
 
+
 %changelog
+* Wed Sep 16 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.17.0-0.1.klarlack.20200916git
+- Switched upstream to Nils Goroll's fork which is the defacto current upstream
+- Synced description to reality
+- This is a snapshot build that needs autotools for building
+- Rebuilt for varnish-6.5.0
+
 * Mon Aug 17 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.16.0-3
 - Rebuilt for varnish-6.4.0