diff --git a/_multibuild b/_multibuild
index fcc7b97..86ed695 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,3 +1,4 @@
 <multibuild>
+  <package>doc</package>
   <package>test</package>
 </multibuild>
diff --git a/python-sphinxcontrib-autoprogram-python310.patch b/python-sphinxcontrib-autoprogram-python310.patch
new file mode 100644
index 0000000..f49baaa
--- /dev/null
+++ b/python-sphinxcontrib-autoprogram-python310.patch
@@ -0,0 +1,17 @@
+Index: autoprogram-0.1.7/sphinxcontrib/autoprogram.py
+===================================================================
+--- autoprogram-0.1.7.orig/sphinxcontrib/autoprogram.py	2022-02-18 13:57:19.100334018 +0100
++++ autoprogram-0.1.7/sphinxcontrib/autoprogram.py	2022-02-18 13:57:56.028550128 +0100
+@@ -476,7 +476,11 @@ class ScannerTestCase(unittest.TestCase)
+         # section: default optionals
+         program, options, group = sections[1]
+         self.assertEqual([], program)
+-        self.assertEqual("optional arguments", group.title)
++        # See https://github.com/sphinx-contrib/autoprogram/issues/24
++        if sys.version_info >= (3, 10):
++            self.assertEqual('options', group.title)
++        else:
++            self.assertEqual("optional arguments", group.title)
+         self.assertEqual(None, group.description)
+         self.assertEqual(2, len(options))
+         self.assertEqual(
diff --git a/python-sphinxcontrib-autoprogram.changes b/python-sphinxcontrib-autoprogram.changes
index 87d337f..0416118 100644
--- a/python-sphinxcontrib-autoprogram.changes
+++ b/python-sphinxcontrib-autoprogram.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb 22 11:19:17 UTC 2022 - pgajdos@suse.com
+
+- fix build and introduced doc build flavor
+- modified sources
+  % _multibuild
+- added patches
+  fix https://github.com/sphinx-contrib/autoprogram/pull/25
+  + python-sphinxcontrib-autoprogram-python310.patch
+
 -------------------------------------------------------------------
 Tue Oct 12 13:40:48 UTC 2021 - pgajdos@suse.com
 
diff --git a/python-sphinxcontrib-autoprogram.spec b/python-sphinxcontrib-autoprogram.spec
index 27fcc21..94880ac 100644
--- a/python-sphinxcontrib-autoprogram.spec
+++ b/python-sphinxcontrib-autoprogram.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,14 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -test
-%bcond_without test
-%else
-%define psuffix %{nil}
-%bcond_with test
+%define psuffix       %{nil}
+%if "%{flavor}" != ""
+%define psuffix      -%{flavor}
 %endif
 %global short_name autoprogram
 # https://github.com/sphinx-contrib/autoprogram/commit/457822502b71a449d97dfece63e77dbee910b581
 %define skip_python36 1
+%define skip_python2 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-sphinxcontrib-%{short_name}
 Version:        0.1.7
@@ -37,6 +35,8 @@ License:        BSD-2-Clause
 Group:          Development/Languages/Python
 URL:            https://github.com/sphinx-contrib/%{short_name}
 Source0:        %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/sphinx-contrib/autoprogram/pull/25
+Patch0:         python-sphinxcontrib-autoprogram-python310.patch
 BuildRequires:  %{python_module Sphinx >= 1.2}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -44,7 +44,7 @@ BuildRequires:  python-rpm-macros
 Requires:       python-Sphinx >= 1.2
 Requires:       python-six
 BuildArch:      noarch
-%if %{with test}
+%if "%{flavor}" == "test"
 BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module sphinxcontrib-autoprogram}
 BuildRequires:  %{python_module sphinxcontrib-websupport >= 1.0.1}
@@ -59,6 +59,7 @@ it into a set of .. program:: and .. option:: directives.
 %package        doc
 Summary:        Documentation for sphinxcontrib-autoprogram
 Group:          Documentation/HTML
+BuildRequires:  python3-sphinxcontrib-autoprogram
 
 %description    doc
 This package contains the documentation for the package
@@ -68,40 +69,35 @@ python-sphinxcontrib-autoprogram.
 %autosetup -n %{short_name}-%{version} -p1
 
 %build
-%if !%{with test}
+%if "%{flavor}" == ""
 %python_build
-
-# need to set PYTHONPATH, otherwise the build won't find the extension in the
-# subfolder
-export PYTHONPATH=$(pwd)
-# set PYTHON so that the sphinx Makefile picks up the correct python version
-%{python_expand export PYTHON=$python}
+%endif
+%if "%{flavor}" == "doc"
+# PYTHONPATH='.' sphinx-build doc html
 sphinx-build -b html -d doc/_build/doctrees doc doc/_build/html
-
-# remove inventory file, not needed for the documentation
 rm doc/_build/html/objects.inv
 %endif
 
 %install
-%if !%{with test}
+%if "%{flavor}" == ""
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
 %check
-%if %{with test}
+%if "%{flavor}" == "test"
 export PYTHONPATH='doc'
 %pyunittest sphinxcontrib/autoprogram.py
 %endif
 
-%if !%{with test}
+%if "%{flavor}" == ""
 %files %{python_files}
 %doc README.rst
 %license LICENSE
 %{python_sitelib}/*
 %endif
 
-%if !%{with test}
+%if "%{flavor}" == "doc"
 %files %{python_files doc}
 %license LICENSE
 %doc doc/_build/html/*