diff --git a/.gitignore b/.gitignore
index 2657b3e..8ecf367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/jitterentropy-library-3.5.0.tar.gz
+SOURCES/jitterentropy-library-3.6.0.tar.gz
diff --git a/.jitterentropy.metadata b/.jitterentropy.metadata
index fc3345b..f508cd8 100644
--- a/.jitterentropy.metadata
+++ b/.jitterentropy.metadata
@@ -1 +1 @@
-9d967e78117ffe2235063a651620e2a5bac4e730 SOURCES/jitterentropy-library-3.5.0.tar.gz
+fc2ca7a94bef565a9dee5c3d8a66ff74560e0c31 SOURCES/jitterentropy-library-3.6.0.tar.gz
diff --git a/SOURCES/jitterentropy-rh-makefile.patch b/SOURCES/jitterentropy-rh-makefile.patch
index f98ee29..28058ad 100644
--- a/SOURCES/jitterentropy-rh-makefile.patch
+++ b/SOURCES/jitterentropy-rh-makefile.patch
@@ -10,7 +10,7 @@ diff -up Makefile.orig Makefile
  LDFLAGS +=-Wl,-z,relro,-z,now -lpthread
  
  # Enable internal timer support
-@@ -28,7 +28,7 @@ LIBDIR := lib
+@@ -34,7 +34,7 @@ LIBDIR := lib
  INCDIR := include
  SRCDIR := src
  
@@ -18,8 +18,8 @@ diff -up Makefile.orig Makefile
 +INSTALL ?= install
  
  NAME := jitterentropy
- LIBMAJOR=$(shell cat $(SRCDIR)/jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}')
-@@ -73,25 +73,25 @@ cppcheck:
+ LIBMAJOR=$(shell cat jitterentropy.h | egrep "define\s+JENT_MAJVERSION" | awk '{print $$3}')
+@@ -83,25 +83,25 @@ cppcheck:
  install: install-man install-shared install-includes
  
  install-man:
diff --git a/SPECS/jitterentropy.spec b/SPECS/jitterentropy.spec
index 7bf62c8..26aa522 100644
--- a/SPECS/jitterentropy.spec
+++ b/SPECS/jitterentropy.spec
@@ -1,11 +1,12 @@
-Name:	jitterentropy
-Version:	3.5.0
-Release:	1%{?dist}
-Summary:	Library implementing the jitter entropy source
+%global libjit_soversion 3
+Name:           jitterentropy
+Version:        3.6.0
+Release:        1%{?dist}
+Summary:        Library implementing the jitter entropy source
 
-License:	BSD-3-Clause OR GPL-2.0-only
-URL:		https://github.com/smuellerDD/jitterentropy-library
-Source0:	%{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz
+License:        BSD-3-Clause OR GPL-2.0-only
+URL:            https://github.com/smuellerDD/jitterentropy-library
+Source0:        %{url}/archive/v%{version}/%{name}-library-%{version}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
@@ -37,7 +38,7 @@ mkdir -p %{buildroot}/usr/include/
 %files
 %doc README.md CHANGES.md
 %license LICENSE LICENSE.bsd LICENSE.gplv2
-%{_libdir}/libjitterentropy.so.3*
+%{_libdir}/libjitterentropy.so.%{libjit_soversion}*
 
 %files devel
 %{_includedir}/*
@@ -45,6 +46,9 @@ mkdir -p %{buildroot}/usr/include/
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 25 2024 Vladis Dronov <vdronov@redhat.com> - 3.6.0-1
+- Update to the upstream v3.6.0 @ 11829386 (RHEL-64947)
+
 * Wed Feb 07 2024 Vladis Dronov <vdronov@redhat.com> - 3.5.0-1
 - Update to the upstream v3.5.0 @ b178ef6b (RHEL-30957)
 - Use proper SPDX license identifiers