diff --git a/.gitignore b/.gitignore
index 47e6daa..d63b25e 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-0d555b6.tar.gz
diff --git a/sources b/sources
index 220d464..634c0e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (varnish-modules-0.15.0.tar.gz) = f24bc7e00db8eb53e4730b9b6d9adb9442d26ad5b07f3e09541b686e41d437113b8bca75f9ac47bc0ec54475fafb0eefc46b98ccee92d9360aaf660b4826ec9e
+SHA512 (varnish-modules-0d555b6.tar.gz) = 726e5726d254b4b4c72f21d6e33df1b93c25744b7f6afb919ce3086417404e2ec23ce8205a67d3ad5267d6b1fc8ec527791226a35634a0f12449732e99ea6321
diff --git a/varnish-modules-0.15.0_format_fix.patch b/varnish-modules-0.15.0_format_fix.patch
new file mode 100644
index 0000000..87ad7cb
--- /dev/null
+++ b/varnish-modules-0.15.0_format_fix.patch
@@ -0,0 +1,11 @@
+--- src/vmod_tcp.c.orig	2018-10-10 20:21:14.324704356 +0200
++++ src/vmod_tcp.c	2018-10-10 20:21:44.329466200 +0200
+@@ -174,7 +174,7 @@
+             sizeof(pacerate)) != 0)
+                 VSLb(ctx->vsl, SLT_VCL_Error, "set_socket_pace(): Error setting pace rate.");
+ 	else
+-                VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %lu KB/s.", rate);
++                VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %jd KB/s.", (intmax_t)rate);
+ 
+ #  ifndef NDEBUG
+         int retval;
diff --git a/varnish-modules.spec b/varnish-modules.spec
index 37f49cd..c006271 100644
--- a/varnish-modules.spec
+++ b/varnish-modules.spec
@@ -1,22 +1,30 @@
 %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
 
-
+%global commit 0d555b627333cd9190a40870f380ace5664f6d0d
+%global gittag 0.15.1
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 Name:    varnish-modules
-Version: 0.15.0
+Version: 0.15.1
 Release: 6%{?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
-Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch
-Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch
+#Source:  https://download.varnish-software.com/varnish-modules/#{name}-#{version}.tar.gz
+Source:  https://github.com/varnish/varnish-cache/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: pkgconfig(varnishapi)
-BuildRequires: varnish
+BuildRequires: python3
+BuildRequires: varnish >= 6.0
+BuildRequires: varnish <= 6.1
+buildrequires: python-docutils
 
-Requires: varnish
+BuildRequires: automake
+BuildRequires: libtool
+
+Requires: varnish = %varnishver
 
 Provides: vmod-bodyaccess = %{version}-%{release}
 Provides: vmod-cookie = %{version}-%{release}
@@ -37,14 +45,11 @@ tcp, var, xkey
 
 
 %prep
-%setup -q
-%if "%varnishver" >= "6.1" 
-%patch10 -p1
-%endif
-%patch11 -p1
+%autosetup -n %{name}-%{commit}
 
 %build
-%configure
+sh bootstrap
+%configure PYTHON=python3
 %make_build
 
 
@@ -65,6 +70,49 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed May 20 2026 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-6
+- Build for varnish-6.0.18
+
+* Thu Mar 26 2026 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-5
+- Build for varnish-6.0.17
+
+* Fri Aug 29 2025 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-4
+- Build for varnish-6.0.16
+
+* Fri Aug 22 2025 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-3
+- Build for varnish-6.0.15
+
+* Tue Aug 12 2025 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-2
+- Built for varnish-6.0.14
+
+* Mon Apr 29 2024 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.1-1
+- New upstream release, removing patches included upstream
+- Built for varnish-6.0.13
+
+* Tue Nov 14 2023 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-14
+- Rebuilt for varnish-6.0.12
+
+* Tue Nov 15 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-13
+- Rebuilt for varnish-6.0.11
+
+* Fri Jan 28 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-12
+- Rebuilt for varnish-6.0.10
+
+* Sat Jul 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-11
+- Rebuilt for varnish-6.0.8
+
+* Mon Nov 16 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-10
+- Rebuilt for varnish-6.0.7
+
+* Thu Feb 13 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-9
+- Rebuilt for varnish-6.0.6
+
+* Fri Nov 15 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.15.0-8
+- Rebuilt for varnish-6.0.5
+
+* Wed Sep 18 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-7
+- Rebuilt for varnish-6.0.4
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild