--- a/opensuse_essential_15.6.sh
+++ b/opensuse_essential_16.0.sh
@@ -10,14 +10,13 @@ libacl1
 make
 makeinfo
 patch
-python
-python-curses
-python-xml
 python3
+python3-GitPython
 python3-Jinja2
 python3-curses
 python3-pexpect
 python3-pip
+python3-xml
 rpcgen
 socat
 tar

With the pip3 install command removed for GitPython, as we can now use
the dedicated python3-GitPython package.

The list for the docs and pdf build have not changed.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 documentation/ref-manual/system-requirements.rst   | 34 +++++++++++++++++++---
 documentation/tools/build-docs-container           | 10 ++++++-
 ...use_essential.sh => opensuse_essential_15.6.sh} |  0
 .../opensuse_essential_16.0.sh                     |  1 +
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/documentation/ref-manual/system-requirements.rst b/documentation/ref-manual/system-requirements.rst
index e94825958..958ea72d6 100644
--- a/documentation/ref-manual/system-requirements.rst
+++ b/documentation/ref-manual/system-requirements.rst
@@ -203,13 +203,39 @@ documentation in PDF format:
 .. literalinclude:: ../tools/host_packages_scripts/fedora_docs_pdf.sh
    :language: shell
 
-openSUSE Packages
------------------
+openSUSE Leap Packages
+----------------------
+
+openSUSE Leap 15.6 Packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Here are the packages needed to build an image on a headless system
+with a supported openSUSE Leap 15.6 distribution:
+
+.. literalinclude:: ../tools/host_packages_scripts/opensuse_essential_15.6.sh
+   :language: shell
+
+Here are the packages needed to build Project documentation manuals:
+
+.. literalinclude:: ../tools/host_packages_scripts/opensuse_docs.sh
+   :language: shell
+
+.. literalinclude:: ../tools/host_packages_scripts/pip3_docs.sh
+   :language: shell
+
+In addition to the previous packages, here are the packages needed to build the
+documentation in PDF format:
+
+.. literalinclude:: ../tools/host_packages_scripts/opensuse_docs_pdf.sh
+   :language: shell
+
+openSUSE Leap 16.0 Packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Here are the packages needed to build an image on a headless system
-with a supported openSUSE distribution:
+with a supported openSUSE Leap 16.0 distribution:
 
-.. literalinclude:: ../tools/host_packages_scripts/opensuse_essential.sh
+.. literalinclude:: ../tools/host_packages_scripts/opensuse_essential_16.0.sh
    :language: shell
 
 Here are the packages needed to build Project documentation manuals:
diff --git a/documentation/tools/build-docs-container b/documentation/tools/build-docs-container
index 4fe0cba63..a540e81ec 100755
--- a/documentation/tools/build-docs-container
+++ b/documentation/tools/build-docs-container
@@ -126,7 +126,15 @@ main ()
     "leap:15.6"*)
       image=opensuse/leap:$version
       containerfile=Containerfile.zypper
-      essential=opensuse_essential.sh
+      essential=opensuse_essential_15.6.sh
+      docs=opensuse_docs.sh
+      docs_pdf=opensuse_docs_pdf.sh
+      pip3=pip3_docs.sh
+      ;;
+    "leap:16.0"*)
+      image=opensuse/leap:$version
+      containerfile=Containerfile.zypper
+      essential=opensuse_essential_16.0.sh
       docs=opensuse_docs.sh
       docs_pdf=opensuse_docs_pdf.sh
       pip3=pip3_docs.sh
diff --git a/documentation/tools/host_packages_scripts/opensuse_essential.sh b/documentation/tools/host_packages_scripts/opensuse_essential_15.6.sh
similarity index 100%
rename from documentation/tools/host_packages_scripts/opensuse_essential.sh
rename to documentation/tools/host_packages_scripts/opensuse_essential_15.6.sh
diff --git a/documentation/tools/host_packages_scripts/opensuse_essential_16.0.sh b/documentation/tools/host_packages_scripts/opensuse_essential_16.0.sh
new file mode 100644
index 000000000..e557ae4fb
--- /dev/null
+++ b/documentation/tools/host_packages_scripts/opensuse_essential_16.0.sh
@@ -0,0 +1 @@
+sudo zypper install bzip2 chrpath diffstat gcc gcc-c++ git gzip hostname libacl1 make makeinfo patch python3 python3-GitPython python3-Jinja2 python3-curses python3-pexpect python3-pip python3-xml rpcgen socat tar wget which xz zstd