diff --git a/.gitignore b/.gitignore
index 9e7b9a4..63927b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,5 @@ zabbix-1.8.2.tar.gz
 /zabbix-6.0.29.tar.gz
 /zabbix-6.0.30.tar.gz
 /zabbix-6.0.33.tar.gz
+/zabbix-6.0.36.tar.gz
+/zabbix-6.0.39.tar.gz
diff --git a/sources b/sources
index 0ef4001..883064e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zabbix-6.0.33.tar.gz) = 02ebcaaf3afe99ede0b82a41fd516e5ea055d50a66cbb582be3dc37d0aaafc06cf82ab35af51885258d0d2c58c17319e3a4f5b923fe7152ff9b437f2a2eb543d
+SHA512 (zabbix-6.0.39.tar.gz) = 046494cd24880d83c7a174482f1c1a29b5bf0cd6b39d1a0909ca628faf9d2a134a7fed728c8776dce877d4dcaf474ff20683ce95e8884b830d99b32e2962b7c1
diff --git a/zabbix-out-of-tree.patch b/zabbix-out-of-tree.patch
index cd7012c..c4ed15b 100644
--- a/zabbix-out-of-tree.patch
+++ b/zabbix-out-of-tree.patch
@@ -666,13 +666,14 @@ diff -up zabbix-6.0.25/src/zabbix_get/Makefile.am.out-of-tree zabbix-6.0.25/src/
 diff -up zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree zabbix-6.0.25/src/zabbix_java/Makefile.am
 --- zabbix-6.0.25/src/zabbix_java/Makefile.am.out-of-tree	2023-12-13 01:17:17.072075499 -0700
 +++ zabbix-6.0.25/src/zabbix_java/Makefile.am	2024-01-04 13:32:00.118044618 -0700
-@@ -9,22 +9,22 @@ EXTRA_DIST = \
+@@ -9,23 +9,23 @@ EXTRA_DIST = \
  	startup.sh
  
  ZJG = bin/zabbix-java-gateway-$(VERSION).jar
--LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.2.9.jar:lib/logback-classic-1.2.9.jar:lib/slf4j-api-1.7.32.jar
+-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-1.5.16.jar:lib/logback-classic-1.5.16.jar:lib/slf4j-api-2.0.16.jar
++LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.5.16.jar:$(srcdir)/lib/logback-classic-1.5.16.jar:$(srcdir)/lib/slf4j-api-2.0.16.jar
+ 
 -JUNIT = tests/junit-4.8.2.jar
-+LIB = $(srcdir)/lib/android-json-4.3_r3.1.jar:$(srcdir)/lib/logback-core-1.2.3.jar:$(srcdir)/lib/logback-classic-1.2.3.jar:$(srcdir)/lib/slf4j-api-1.7.30.jar
 +JUNIT = $(srcdir)/tests/junit-4.8.2.jar
  
  ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
diff --git a/zabbix.spec b/zabbix.spec
index 5750081..849e4c0 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -16,8 +16,8 @@
 
 Name:           zabbix
 Epoch:          1
-Version:        6.0.33
-Release:        2%{?dist}
+Version:        6.0.39
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -825,6 +825,13 @@ fi
 %files web-pgsql
 
 %changelog
+* Wed Apr 02 2025 Orion Poplawski <orion@nwra.com> - 1:6.0.39-1
+- Update to 6.0.39 (CVE-2024-45700, CVE-2024-36469, CVE-2024-42325, CVE-2024-45699)
+
+* Sat Nov 30 2024 Orion Poplawski <orion@nwra.com> - 1:6.0.36-1
+- Update to 6.0.36 (CVE-2024-42330 rhbz#2329219, CVE-2024-42332 rhbz#2329222,
+  CVE-2024-42333 rhbz#2329225)
+
 * Mon Aug 19 2024 Orion Poplawski <orion@nwra.com> - 1:6.0.33-2
 - Use alternatives name that systemd likes for units (bz#2305855)