diff --git a/.gitignore b/.gitignore
index 80e1a61..c45b998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ urlwatch-1.11.tar.gz
 /urlwatch-1.15.tar.gz
 /urlwatch-1.16.tar.gz
 /urlwatch-1.18.tar.gz
+/urlwatch-2.6.tar.gz
diff --git a/sources b/sources
index da90918..6964a17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3110c1961c70590f24f346ceae0e67f  urlwatch-1.18.tar.gz
+SHA512 (urlwatch-2.6.tar.gz) = 52d71984972c6888ade01fcc635d33a60c024424b82ac9319554f548438f8a4e2f32a8b7d3047ed86654c8ef67e3b6eac99728f9409b60cdffe7e842fd8fe16c
diff --git a/urlwatch.spec b/urlwatch.spec
index feebce8..77338d1 100644
--- a/urlwatch.spec
+++ b/urlwatch.spec
@@ -1,5 +1,5 @@
 Name:           urlwatch
-Version:        1.18
+Version:        2.6
 Release:        1%{?dist}
 Summary:        A tool for monitoring webpages for updates
 
@@ -31,20 +31,20 @@ Basic features
 * Example hooks to filter content in Python
 
 %prep
-%setup -q
-2to3 -w urlwatch lib/urlwatch/*.py share/urlwatch/examples/hooks.py.example setup.py
+%autosetup
 
 %build
-%{__python3} setup.py build
+%py3_build
 
 %install
-%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
+%py3_install
 # Fix exec permission for rpmlint
 chmod 0755 %{buildroot}%{python3_sitelib}/%{name}/*txt.py
 chmod a+x %{buildroot}%{python3_sitelib}/%{name}/handler.py
 
 %files
-%doc ChangeLog COPYING
+%doc ChangeLog
+%license COPYING
 %{_mandir}/man*/*.*
 %{_bindir}/%{name}
 %{_datadir}/%{name}/examples/
@@ -52,6 +52,9 @@ chmod a+x %{buildroot}%{python3_sitelib}/%{name}/handler.py
 %{python3_sitelib}/%{name}*.egg-info
 
 %changelog
+* Thu Dec 29 2016 Fabian Affolter <mail@fabian-affolter.ch> - 2.6-1
+- Update to latest upstream release 2.6
+
 * Thu May 07 2015 Fabian Affolter <mail@fabian-affolter.ch> - 1.18-1
 - Update to latest upstream release 1.18