diff --git a/python-screeninfo.changes b/python-screeninfo.changes
index 4ed06a2..8a3d436 100644
--- a/python-screeninfo.changes
+++ b/python-screeninfo.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Thu May  7 15:14:56 UTC 2020 - andy great <andythe_great@pm.me>
+
+- Add use_dataclasses_when_needed.patch patch.
+- Add python-dataclasses for leap. 
+
 -------------------------------------------------------------------
 Fri Apr 24 03:22:54 UTC 2020 - andy great <andythe_great@pm.me>
 
 - Update to version 0.6.5 
+  * No changelog was made available.
 
 -------------------------------------------------------------------
 Thu Dec 26 15:19:57 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
diff --git a/python-screeninfo.spec b/python-screeninfo.spec
index 47d036b..d6ade89 100644
--- a/python-screeninfo.spec
+++ b/python-screeninfo.spec
@@ -16,6 +16,7 @@
 #
 
 
+%define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-screeninfo
 Version:        0.6.5
@@ -24,7 +25,12 @@ Summary:        Fetch location and size of physical screens
 License:        MIT
 URL:            https://github.com/rr-/screeninfo
 Source0:        https://github.com/rr-/screeninfo/archive/%{version}.tar.gz#/screeninfo-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/rr-/screeninfo/pull/36 -- Use dataclass when needed
+Patch0:         use_dataclasses_when_needed.patch
 BuildRequires:  %{python_module setuptools}
+%if 0%{?suse_version} <= 1500
+BuildRequires:  %{python_module dataclasses}
+%endif
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
@@ -35,6 +41,7 @@ Python module to fetch location and size of physical screens.
 
 %prep
 %setup -q -n screeninfo-%{version}
+%patch0 -p1
 
 %build
 %python_build
diff --git a/use_dataclasses_when_needed.patch b/use_dataclasses_when_needed.patch
new file mode 100644
index 0000000..64375b2
--- /dev/null
+++ b/use_dataclasses_when_needed.patch
@@ -0,0 +1,12 @@
+diff -ruN a/setup.py b/setup.py
+--- a/setup.py	2020-04-15 15:13:07.000000000 +0100
++++ b/setup.py	2020-04-30 02:38:18.000000000 +0100
+@@ -11,7 +11,7 @@
+     keywords=["screen", "monitor", "desktop"],
+     classifiers=[],
+     install_requires=[
+-        "dataclasses",
++        "dataclasses ; python_version<'3.7'",
+         'Cython ; sys_platform=="darwin"',
+         'pyobjus ; sys_platform=="darwin"',
+     ],