diff --git a/rhel-system-roles-sap.spec b/rhel-system-roles-sap.spec
index 505e0e2..125a363 100644
--- a/rhel-system-roles-sap.spec
+++ b/rhel-system-roles-sap.spec
@@ -35,7 +35,7 @@
 Name: %{package_name}
 Summary: System Roles to configure RHEL for running SAP NetWeaver- or SAP HANA-based products
 Version: 3.1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Url: https://github.com/berndfinger
 Source0: https://github.com/linux-system-roles/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
@@ -48,6 +48,7 @@ Source5: galaxy.yml
 # patches 50-99 for sap-hana-preconfigure
 Patch50: sap-hana-preconfigure-md2html-error.patch
 # patches 100-149 for sap-netweaver-preconfigur
+Patch100: sap-netweaver-preconfigure-rhel9.patch
 
 BuildArch: noarch
 
@@ -134,6 +135,9 @@ sed -i -e 's|name: rhel|name: %{collection_name}|' galaxy.yml
 pushd sap-hana-preconfigure
 %patch50 -p1
 popd
+pushd sap-netweaver-preconfigure
+%patch100 -p1
+popd
 
 # remove git stuff
 rm -rf *-preconfigure/.git*
@@ -239,6 +243,9 @@ popd
 %endif
 
 %changelog
+* Fri Jul 16 2021 Than Ngo <than@redhat.com> - 3.1.1-8
+- Related: #1977195, add missing vars/RedHat_9.yml in sap-netweaver-preconfigure
+
 * Tue Jul 13 2021 Than Ngo <than@redhat.com> - 3.1.1-7
 - Related: #1977195, add missing __sap_preconfigure_envgroups for RHEL 7.x and
   missing __sap_hana_preconfigure_req_repos variables for RHEL 8.5 and later
diff --git a/sap-netweaver-preconfigure-rhel9.patch b/sap-netweaver-preconfigure-rhel9.patch
new file mode 100644
index 0000000..7237d46
--- /dev/null
+++ b/sap-netweaver-preconfigure-rhel9.patch
@@ -0,0 +1,57 @@
+diff -up sap-netweaver-preconfigure/tasks/main.yml.me sap-netweaver-preconfigure/tasks/main.yml
+--- sap-netweaver-preconfigure/tasks/main.yml.me	2021-07-16 20:47:31.917915614 +0200
++++ sap-netweaver-preconfigure/tasks/main.yml	2021-07-16 20:49:14.545505014 +0200
+@@ -7,7 +7,7 @@
+ - name: Include os specific vars
+   include_vars: '{{ item }}'
+   with_first_found:
+-    - '{{ ansible_distibution }}_{{ ansible_distribution_version }}.yml'
++    - '{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml'
+     - '{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml'
+     - '{{ ansible_os_family }}.yml'
+ 
+diff -up sap-netweaver-preconfigure/vars/RedHat_9.yml.me sap-netweaver-preconfigure/vars/RedHat_9.yml
+--- sap-netweaver-preconfigure/vars/RedHat_9.yml.me	2021-07-16 20:47:58.990334885 +0200
++++ sap-netweaver-preconfigure/vars/RedHat_9.yml	2021-07-16 20:48:15.158585284 +0200
+@@ -0,0 +1,41 @@
++---
++
++# vars file for sap-netweaver-preconfigure
++
++__sap_netweaver_preconfigure_sapnotes:
++  - "2526952"
++
++__sap_netweaver_preconfigure_packages:
++  - tuned-profiles-sap
++
++__sap_netweaver_preconfigure_min_swap_space_mb: '20480'
++
++__sap_netweaver_preconfigure_adobe_doc_services_packages:
++  - autoconf.noarch
++  - automake.noarch
++  - cyrus-sasl.x86_64
++  - expat.x86_64
++  - fontconfig.x86_64
++  - glibc-devel.i686
++  - keyutils-libs.x86_64
++  - krb5-libs.x86_64
++  - libcom_err.x86_64
++  - libidn2.x86_64
++  - libselinux.x86_64
++  - libssh2.x86_64
++  - libxcb.i686
++  - nspr.x86_64
++  - nss.x86_64
++  - nss-softokn.x86_64
++  - nss-softokn-freebl.x86_64
++  - nss-util.x86_64
++  - openldap.x86_64
++  - openssl.x86_64
++  - zlib.x86_64
++  - libstdc++.i686
++  - libX11.i686
++  - libXau.i686
++  - glibc.i686
++  - libstdc++.i686
++  - libgcc.i686
++  - libuuid.i686