diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec
index fbaff88..933683f 100644
--- a/python-rpm-generators.spec
+++ b/python-rpm-generators.spec
@@ -1,7 +1,7 @@
 Name:           python-rpm-generators
 Summary:        Dependency generators for Python RPMs
 Version:        12
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 # Originally all those files were part of RPM, so license is kept here
 License:        GPLv2+
@@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py
 %{_rpmconfigdir}/pythonbundles.py
 
 %changelog
+* Fri May 27 2022 Miro Hrončok <mhroncok@redhat.com> - 12-15
+- Don't include all requirements with True-evaluating markers in extras subpackages
+- Fixes: rhbz#2090186
+
 * Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 12-14
 - Add namespace option to pythodistdeps.py to allow mingw-python generatros
 
diff --git a/pythondistdeps.py b/pythondistdeps.py
index 92be3a5..b825c35 100755
--- a/pythondistdeps.py
+++ b/pythondistdeps.py
@@ -112,10 +112,17 @@ class Distribution(PathDistribution):
 
     def requirements_for_extra(self, extra):
         extra_deps = []
+        # we are only interested in dependencies with extra == 'our_extra' marker
         for req in self.requirements:
+            # no marker at all, nothing to evaluate
             if not req.marker:
                 continue
-            if req.marker.evaluate(get_marker_env(self, extra)):
+            # does the marker include extra == 'our_extra'?
+            # we can only evaluate the marker as a whole,
+            # so we evaluate it twice (using 2 different marker_envs)
+            # and see if it only evaluates to True with our extra
+            if (req.marker.evaluate(get_marker_env(self, extra)) and
+                    not req.marker.evaluate(get_marker_env(self, None))):
                 extra_deps.append(req)
         return extra_deps
 
diff --git a/tests/data/scripts_pythondistdeps/test-data.yaml b/tests/data/scripts_pythondistdeps/test-data.yaml
index 54e5b66..6a8152d 100644
--- a/tests/data/scripts_pythondistdeps/test-data.yaml
+++ b/tests/data/scripts_pythondistdeps/test-data.yaml
@@ -1353,4 +1353,13 @@
                 python3.9dist(zope-component[security])
                 python3.9dist(zope-component[zcml])
                 python3.9dist(zope-testing)
+--requires --normalized-names-format pep503 --require-extras-subpackages --package-name python3-build+virtualenv:
+    --provides --majorver-provides --normalized-names-format pep503 --package-name python3-build+virtualenv:
+        usr/lib/python3.10/site-packages/build-0.8.0.dist-info:
+            provides: |-
+                python3.10dist(build[virtualenv]) = 0.8
+                python3dist(build[virtualenv]) = 0.8
+            requires: |-
+                python(abi) = 3.10
+                python3.10dist(virtualenv) >= 20.0.35
 
diff --git a/tests/data/scripts_pythondistdeps/test-requires.yaml b/tests/data/scripts_pythondistdeps/test-requires.yaml
index d876674..ade5043 100644
--- a/tests/data/scripts_pythondistdeps/test-requires.yaml
+++ b/tests/data/scripts_pythondistdeps/test-requires.yaml
@@ -100,3 +100,6 @@ dnspython:
         '2.1.0': ['3.9']
     wheel:
         '2.1.0': ['3.9']
+build:
+    wheel:
+        '0.8.0': ['3.10']