diff --git a/macros.pyproject b/macros.pyproject
index 1b0aa02..e4f3d62 100644
--- a/macros.pyproject
+++ b/macros.pyproject
@@ -50,7 +50,8 @@ fi
 }
 
 
-%python_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{pyproject_ghost_distinfo}}}} %**}}}
+# Note: the three times nested questionmarked -i -f -F pattern means: If none of those options was used -- in that case, we inject our own -f
+%pyproject_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{pyproject_ghost_distinfo}}}} %**}}}
 
 
 %pyproject_save_files() %{expand:\\\
diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec
index 4dd03f1..7db19f4 100644
--- a/pyproject-rpm-macros.spec
+++ b/pyproject-rpm-macros.spec
@@ -6,7 +6,7 @@ License:        MIT
 
 # Keep the version at zero and increment only release
 Version:        0
-Release:        20%{?dist}
+Release:        21%{?dist}
 
 # Macro files
 Source001:      macros.pyproject
@@ -101,6 +101,9 @@ export HOSTNAME="rpmbuild"  # to speedup tox in network-less mock, see rhbz#1856
 %license LICENSE
 
 %changelog
+* Tue Aug 04 2020 Miro Hrončok <mhroncok@redhat.com> - 0-21
+- Actually implement %%pyproject_extras_subpkg
+
 * Wed Jul 29 2020 Miro Hrončok <mhroncok@redhat.com> - 0-20
 - Implement %%pyproject_extras_subpkg