diff --git a/.gitignore b/.gitignore
index e722d1d..fceb9c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /varnish-modules-0032ed8.tar.gz
 /varnish-modules-0.16.0.tar.gz
 /varnish-modules-4d6593c.tar.gz
+/varnish-modules-0.17.1.tar.gz
diff --git a/sources b/sources
index 7a6624f..18c22fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (varnish-modules-4d6593c.tar.gz) = bb118cd844e0519db2dea0b3b4be1f3fda8760e9380537cd1e2a3ef52b2156ed51b608b02a9ce021ec25a405ffa4e5b9bbe811d6c410dab93ff1a4207f694416
+SHA512 (varnish-modules-0.17.1.tar.gz) = 354f06f6da7c87a3ba28f1871870ec52bba1af40622c6176c1a1cae70f0bbf5f658206f82c4542eb7e8e7c7ef5e03a2cff598e6f799d3a4fdcc5e7113ce0900f
diff --git a/varnish-modules.spec b/varnish-modules.spec
index ce1de1f..1be558d 100644
--- a/varnish-modules.spec
+++ b/varnish-modules.spec
@@ -1,6 +1,5 @@
 %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
-%global commit 4d6593c2c97ecbabd3bd68203bace9cdbd6e960c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global gittag 0.17.1
 
 %if 0%{?rhel} == 7 || 0%{?rhel} == 6
 %global docutils python34-docutils
@@ -11,13 +10,13 @@
 %endif
 
 Name:    varnish-modules
-Version: 0.17.0
-Release: 0.3.klarlack.20200916git%{shortcommit}%{?dist}
+Version: 0.17.1
+Release: 1%{?dist}
 Summary: A collection of modules ("vmods") extending Varnish VCL
 
 License: BSD
-URL:     https://github.com/nigoroll/varnish-modules
-Source:  https://github.com/nigoroll/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+URL:     https://github.com/varnish/varnish-modules
+Source:  https://github.com/varnish/varnish-modules/archive/%{gittag}/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
@@ -49,7 +48,7 @@ bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey
 
 
 %prep
-%autosetup -n %{name}-%{commit}
+%autosetup -n %{name}-%{gittag}
 
 
 %build
@@ -74,13 +73,19 @@ sed -i 's,tests/xkey/test12.vtc,,' src/Makefile
 
 
 %files
-%doc docs AUTHORS CHANGES.rst COPYING README.rst
+#doc docs AUTHORS CHANGES.rst COPYING README.rst
+%doc AUTHORS CHANGES.rst COPYING README.rst
 %license LICENSE
 %{_libdir}/varnish/vmods/*
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Wed Mar 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.17.1-1
+- New upstream release
+- Switched back to original varnish github upstream, as it has catched up
+- Includes fix for CVE-2021-28543, VSV00006, bz#1939669
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-0.3.klarlack.20200916git4d6593c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild