diff --git a/.gitignore b/.gitignore
index 46a01ac..034db63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /udiskie-1.7.4.tar.gz
 /udiskie-1.7.5.tar.gz
 /udiskie-1.7.7.tar.gz
+/udiskie-2.0.2.tar.gz
diff --git a/sources b/sources
index 656a337..07c0054 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (udiskie-1.7.7.tar.gz) = ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a
+SHA512 (udiskie-2.0.2.tar.gz) = ae3e298b11adaa50046bf521c5f3bd67cbcaa2f1e1cf18cf43f4b6b086ded2540f7db93de5c8b57048ea1bb115fb5266f9e3b69f7bb1acb9b7f429efcbe101c1
diff --git a/udiskie.spec b/udiskie.spec
index 7f50288..6bceb6f 100644
--- a/udiskie.spec
+++ b/udiskie.spec
@@ -1,6 +1,6 @@
 Name:           udiskie
-Version:        1.7.7
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Removable disk auto-mounter
 
 License:        MIT
@@ -22,7 +22,7 @@ Requires: polkit hicolor-icon-theme
 %if 0%{?!rhel}
 # Recommended for full functionality
 Recommends: libnotify
-%endif # %%{?rhel}
+%endif
 
 %description
 %{name} is a front-end for UDisks written in python. Its main purpose is
@@ -32,9 +32,11 @@ mounting and unmounting operations.
 
 %package -n python3-%{name}
 Summary: Python 3 module for udisks disk automounting
-%global py3_requires udisks2 gtk3 python3-gobject python3-docopt python3-PyYAML
-BuildRequires: %{py3_requires}
-Requires: %{py3_requires}
+%global non_python_requires udisks2 gtk3 python3-gobject
+
+BuildRequires: %{non_python_requires}
+BuildRequires: %{py3_dist docopt PyYAML}
+Requires: %{non_python_requires}
 %{?python_provide:%python_provide python3-%{name}}
 
 %description -n python3-%{name}
@@ -43,15 +45,12 @@ python 3 modules used by the %{name} binaries.
 
 %prep
 %setup -q
-find -name '*.txt' | xargs chmod -x
-# Copy common doc files to the top dir
-cp -prt.. doc CONTRIBUTORS COPYING README.rst
+find -name '*.txt' -exec chmod -x '{}' +
+find -name '*.py' -exec sed -i 's|^#!python|#!%{__python3}|' '{}' +
 
 # Make test folder into a proper module, if it already isn't
 [ -f test/__init__.py ] || touch test/__init__.py
 
-find . -name '*.py' | xargs sed -i 's|^#!python|#!%{__python3}|'
-
 %build
 %py3_build
 
@@ -100,6 +99,10 @@ done
 
 
 %changelog
+* Thu Jan 02 2020 Jan Staněk <jstanek@redhat.com> - 2.0.2-1
+- Upgrade to version 2.0.2
+- Modernize and clean spec file
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.7-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)