diff --git a/.gitignore b/.gitignore
index 47e6daa..aec2562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /varnish-modules-0.12.1.tar.gz
 /varnish-modules-0.15.0.tar.gz
+/varnish-modules-0032ed8.tar.gz
diff --git a/sources b/sources
index 220d464..b4e3785 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (varnish-modules-0.15.0.tar.gz) = f24bc7e00db8eb53e4730b9b6d9adb9442d26ad5b07f3e09541b686e41d437113b8bca75f9ac47bc0ec54475fafb0eefc46b98ccee92d9360aaf660b4826ec9e
+SHA512 (varnish-modules-0032ed8.tar.gz) = 9ad2bc33a954645f267ae61a299fc067cb075959ade0ecc2dbf080867c6b3039835994b628aeea92ecfb0b3bbce9d3fae83945f48b57df32a2e86c030ee1c704
diff --git a/varnish-modules.spec b/varnish-modules.spec
index 0c37d8a..83df087 100644
--- a/varnish-modules.spec
+++ b/varnish-modules.spec
@@ -1,33 +1,38 @@
 %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
 
+%global commit 0032ed81820cbc7d8d0bdda8f0a14dc968a9de4f
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+%if 0%{?rhel} == 7 || 0%{?rhel} == 6
+%global docutils python34-docutils
+%else
+%global docutils python3-docutils
+%endif
 
 Name:    varnish-modules
-Version: 0.15.0
-Release: 8%{?dist}
+Version: 0.16.0
+Release: 0.1.20200318git%{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
-
-Patch99: varnish-modules-0.15.0.add.bootstrap.patch
-# bz #1736943: Fetched forward compatibiliy patch from
-# https://github.com/nigoroll/varnish-modules, checkout fe1a981
-Patch100: varnish-modules-0.15.0.nigoroll_to_fe1a981_compatible_with_varnish-6.3.0.patch
+Source:  https://github.com/varnish/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+#Source:  https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: pkgconfig(varnishapi)
 BuildRequires: varnish
 
+# Build from a git checkout
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
+BuildRequires: %docutils
 
-Requires: varnish
+Requires: varnish = %varnishver
 
 Provides: vmod-bodyaccess = %{version}-%{release}
-Provides: vmod-cookie = %{version}-%{release}
 Provides: vmod-header = %{version}-%{release}
 Provides: vmod-saintmode = %{version}-%{release}
 Provides: vmod-tcp = %{version}-%{release}
@@ -40,29 +45,31 @@ Provides: vmod-xkey = %{version}-%{release}
 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): cookie, vsthrottle, header, saintmode, softpurge,
+kept individually): vsthrottle, header, saintmode, softpurge,
 tcp, var, xkey
 
 
 %prep
-%setup -q
-%patch99 -p0
-%patch100 -p1
+%autosetup -n %{name}-%{commit}
+#autosetup
 
 
 %build
 sh bootstrap
-%configure
-%make_build
+%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 ppc
+# 64-bit specific test
+sed -i 's,tests/xkey/test12.vtc,,' src/Makefile
+%endif
 %make_build check VERBOSE=1
 
 
@@ -73,6 +80,11 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Mar 17 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.1-0.1.20200317git21d0c84
+- Snapshot from 6.4 branch, rebuilt against varnish-6.4.0
+- Removed patches merged upstream
+- Delete 64-bit specific test on 32-bit arches
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild