diff --git a/python-dnspython.changes b/python-dnspython.changes
index 7a0353f..fe1897f 100644
--- a/python-dnspython.changes
+++ b/python-dnspython.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 19 12:28:45 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+
+- Update dependencies to cover all optional features and dependencies in a more structured way and describe it in the package description.
+
 -------------------------------------------------------------------
 Tue Jan 18 14:29:53 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
 
diff --git a/python-dnspython.spec b/python-dnspython.spec
index 29afeab..34a2735 100644
--- a/python-dnspython.spec
+++ b/python-dnspython.spec
@@ -30,13 +30,23 @@ BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module poetry}
 # SECTION tests
-BuildRequires:  %{python_module cryptography}
-BuildRequires:  %{python_module ecdsa}
-BuildRequires:  %{python_module idna}
-BuildRequires:  %{python_module pycryptodome}
-BuildRequires:  %{python_module requests-toolbelt}
-BuildRequires:  %{python_module trio >= 0.14.0}
+#BuildRequires:  %%{python_module ecdsa}
+#BuildRequires:  %%{python_module pycryptodome}
 BuildRequires:  %{python_module typing}
+# doh:
+BuildRequires:  %{python_module httpx}
+BuildRequires:  %{python_module h2}
+BuildRequires:  %{python_module requests-toolbelt}
+BuildRequires:  %{python_module requests}
+# idna
+BuildRequires:  %{python_module idna}
+# dnssec
+BuildRequires:  %{python_module cryptography}
+# trio
+BuildRequires:  %{python_module trio >= 0.14.0}
+# curio
+BuildRequires:  %{python_module sniffio >= 1.1}
+BuildRequires:  %{python_module curio >= 1.2}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 # /SECTION tests
@@ -45,17 +55,26 @@ BuildRequires:  netcfg
 BuildRequires:  unzip
 BuildRequires:  (python3-contextvars if python3-base < 3.7)
 BuildRequires:  (python36-contextvars if python36-base)
-Requires:       python-ecdsa
-Requires:       python-pycryptodome
-Requires:       python-requests-toolbelt
+#Requires:       python-ecdsa
+#Requires:       python-pycryptodome
 %if %{python_version_nodots} < 37
 Requires:       python-contextvars
 %endif
+# doh
+Requires:       python-requests
+Requires:       python-h2
+Requires:       python-httpx
+Requires:       python-requests-toolbelt
+# idna
+Requires:       python-idna >= 2.1
+# dnssec
+Requires:       python-cryptography
+# trio
+Suggests:       python-trio >= 0.14.0
+# curio
+Suggests:       python-sniffio >= 1.1
+Suggests:       python-curio >= 1.2
 BuildArch:      noarch
-Recommends:     python-cryptography
-Recommends:     python-idna >= 2.1
-Recommends:     python-sniffio >= 1.1
-Recommends:     python-trio >= 0.14.0
 
 %python_subpackages
 
@@ -69,6 +88,16 @@ level classes perform queries for data of a given name, type, and
 class, and return an answer set. The low level classes allow direct
 manipulation of DNS zones, messages, names, and records.
 
+The package requires dependencies necessary for these optional features:
+- DNS over HTTPS (doh)
+- IDNA
+- DNSSEC
+and suggest dependencies necessary for these optional features:
+- trio
+- curio
+This optional feature is not available due to missing dependencies:
+- wmi
+
 %prep
 %setup -q -n dnspython-%{version}
 chmod -x examples/*