diff --git a/SOURCES/openscap-1.3.5-almalinux.patch b/SOURCES/openscap-1.3.5-almalinux.patch
new file mode 100644
index 0000000..93bd510
--- /dev/null
+++ b/SOURCES/openscap-1.3.5-almalinux.patch
@@ -0,0 +1,70 @@
+diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml
+--- openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml 2020-04-30 11:50:09.000000000 +0300
++++ openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml 2021-03-22 13:12:12.069413537 +0300
+@@ -133,6 +133,19 @@
+
+
+
++
++
++ AlmaLinux 8
++
++ AlmaLinux 8
++
++
++ The operating system installed on the system is AlmaLinux 8
++
++
++
++
++
+
+
+ Community Enterprise Operating System 5
+@@ -828,6 +841,11 @@
+
+
+
++
++
++
++
+
+
+@@ -1165,6 +1183,9 @@
+
+ oraclelinux-release
+
++
++ almalinux-release
++
+
+ HKEY_LOCAL_MACHINE
+ SOFTWARE\Microsoft\Windows NT\CurrentVersion
+@@ -1233,6 +1254,10 @@
+ ^oraclelinux-release
+ ^8
+
++
++ ^almalinux-release
++ ^8
++
+
+ ^16$
+
+diff -Naur openscap-1.3.5/cpe/openscap-cpe-dict.xml openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml
+--- openscap-1.3.5/cpe/openscap-cpe-dict.xml 2021-04-23 13:39:58.000000000 +0300
++++ openscap-1.3.5.alma/cpe/openscap-cpe-dict.xml 2021-10-10 10:02:27.000000000 +0300
+@@ -37,6 +37,10 @@
+ Community Enterprise Operating System 8
+ oval:org.open-scap.cpe.centos:def:8
+
++
++ AlmaLinux 8
++ oval:org.open-scap.cpe.almalinux:def:8
++
+
+ Fedora 32
+ oval:org.open-scap.cpe.fedora:def:32
diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec
index 8dc5352..adc17c4 100644
--- a/SPECS/openscap.spec
+++ b/SPECS/openscap.spec
@@ -1,11 +1,13 @@
Name: openscap
Version: 1.3.6
-Release: 3%{?dist}
+Release: 3%{?dist}.alma
Summary: Set of open source libraries enabling integration of the SCAP line of standards
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.open-scap.org/
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Add AlmaLinux definitions
+Patch100: openscap-1.3.5-almalinux.patch
Patch1: openscap-1.3.7-PR-1841-coverity.patch
Patch2: openscap-1.3.7-PR-1843-fix-test-ds-misc.patch
Patch3: openscap-1.3.7-PR-1844-fix-test-ds-misc-2.patch
@@ -228,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/oscap-run-sce-script
%changelog
+* Fri Apr 01 2022 Eduard Abdullin - 1.3.6-3.alma
+- AlmaLinux changes
+
* Wed Feb 02 2022 Jan Černý - 1.3.6-3
- Prevent fails of test_ds_misc.sh