diff --git a/python-chameleon.spec b/python-chameleon.spec
index 51ba70c..30815f1 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -1,13 +1,13 @@
 %global srcname Chameleon
 
 Name:           python-chameleon
-Version:        3.6.2
-Release:        6%{?dist}
+Version:        3.7.1
+Release:        1%{?dist}
 Summary:        XML-based template compiler
 
 License:        BSD
 URL:            https://github.com/malthe/chameleon
-Source0:        %pypi_source %{srcname}
+Source0:        https://github.com/malthe/chameleon/archive/%{version}/chameleon-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -39,7 +39,7 @@ Requires:   python3-lxml
 %description -n python3-chameleon %_description
 
 %prep
-%autosetup -n Chameleon-%{version}
+%autosetup -n chameleon-%{version}
 
 %build
 %py3_build
@@ -62,6 +62,9 @@ find %{buildroot}%{python3_sitelib}/chameleon -name '*.txt' -exec rm \{\} \;
 %{python3_sitelib}/Chameleon-%{version}*
 
 %changelog
+* Sat May 30 2020 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 3.7.1-1
+- Update to upstream (bz#1818599, bz#1817632, bz#1678778)
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-6
 - Rebuilt for Python 3.9