diff --git a/README.rst b/README.rst
index c9e733e..6a68e34 100644
--- a/README.rst
+++ b/README.rst
@@ -90,9 +90,9 @@ The content of the **Credentials file** looks like this:
 
 .. _`Google Photos`: https://photos.google.com
 
-.. |PythonVersions| image:: https://img.shields.io/badge/python-2.7+ / 3.6+-red.svg
+.. |PythonVersions| image:: https://img.shields.io/badge/python-3.6+-red.svg
    :target: https://www.python.org/downloads
-   :alt: Python 2.7+/3.6+
+   :alt: Python 3.6+
 
 .. |PypiPackage| image:: https://badge.fury.io/py/pibooth-google-photo.svg
    :target: https://pypi.org/project/pibooth-google-photo
diff --git a/setup.py b/setup.py
index 5b1a17b..3c18c26 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@
 
 HERE = osp.abspath(osp.dirname(__file__))
 sys.path.insert(0, HERE)
-import pibooth_google_photo as plugin
+import pibooth_google_photo as plugin  # nopep8 : import shall be done after adding setup to paths
 
 
 def main():
@@ -26,9 +26,10 @@ def main():
             'Intended Audience :: End Users/Desktop',
             'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
             'Operating System :: POSIX :: Linux',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
+            'Programming Language :: Python :: 3.9',
             'Natural Language :: English',
             'Topic :: Multimedia :: Graphics :: Capture :: Digital Camera',
         ],
@@ -43,14 +44,11 @@ def main():
             'photobooth'
         ],
         py_modules=['pibooth_google_photo'],
+        python_requires=">=3.6",
         install_requires=[
             'pibooth>=2.0.0',
             'google-auth-oauthlib>=0.4.2'
         ],
-        options={
-            'bdist_wheel':
-                {'universal': True}
-        },
         zip_safe=False,  # Don't install the lib as an .egg zipfile
         entry_points={'pibooth': ["pibooth_google_photo = pibooth_google_photo"]},
     )