diff --git a/float_none_comparison_fix.patch b/float_none_comparison_fix.patch
new file mode 100644
index 0000000..838fbde
--- /dev/null
+++ b/float_none_comparison_fix.patch
@@ -0,0 +1,14 @@
+diff --git a/dns/query.py b/dns/query.py
+index bfecd43..19b9fbb 100644
+--- a/dns/query.py
++++ b/dns/query.py
+@@ -467,7 +467,8 @@ def xfr(where, zone, rdtype=dns.rdatatype.AXFR, rdclass=dns.rdataclass.IN,
+     first = True
+     while not done:
+         mexpiration = _compute_expiration(timeout)
+-        if mexpiration is None or mexpiration > expiration:
++        if mexpiration is None or \
++           (expiration is not None and mexpiration > expiration):
+             mexpiration = expiration
+         if use_udp:
+             _wait_for_readable(s, expiration)
diff --git a/python-dns.spec b/python-dns.spec
index 18cf813..6de764c 100644
--- a/python-dns.spec
+++ b/python-dns.spec
@@ -1,6 +1,6 @@
 Name:           python-dns
 Version:        1.15.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        DNS toolkit for Python
 
 License:        MIT
@@ -14,6 +14,10 @@ Patch0:         test_fails_on_missing_file.patch
 # Upstream issue: https://github.com/rthalley/dnspython/issues/339
 Patch1:         fix_unicode_label_escaping.patch
 
+# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2075187
+# Backported from upstream: https://github.com/rthalley/dnspython/commit/9fbf9b223dc26262b1cf23f623f89283ee9c8375
+Patch2:         float_none_comparison_fix.patch
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 
@@ -71,6 +75,10 @@ find examples -type f | xargs chmod a-x
 
 
 %changelog
+* Thu Apr 21 2022 Charalampos Stratakis <cstratak@redhat.com> - 1.15.0-11
+- Fix comparison between float and None types
+Resolves: rhbz#2075187
+
 * Thu Oct 24 2019 Lumír Balhar <lbalhar@redhat.com> - 1.15.0-10
 - Release bump for gating
 Related: rhbz#1731081