diff --git a/libdb.spec b/libdb.spec
index e2f0f39..34a3a7e 100644
--- a/libdb.spec
+++ b/libdb.spec
@@ -4,7 +4,7 @@
 Summary: The Berkeley DB database library for C
 Name: libdb
 Version: 5.3.28
-Release: 30%{?dist}
+Release: 31%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 # For mt19937db.c
@@ -45,6 +45,7 @@ Patch33: db-5.3.28-cwd-db_config.patch
 Patch34: libdb-5.3.21-region-size-check.patch
 # Patch sent upstream
 Patch35: checkpoint-opd-deadlock.patch
+Patch36: db-5.3.28-atomic_compare_exchange.patch
 
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD and LGPLv2 and Sleepycat
@@ -243,6 +244,7 @@ popd
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%patch36 -p1
 
 cd dist
 ./s_config
@@ -451,6 +453,9 @@ mv man/* ${RPM_BUILD_ROOT}%{_mandir}/man1
 %{_libdir}/libdb_java.so
 
 %changelog
+* Wed May 23 2018 Petr Kubat <pkubat@redhat.com> - 5.3.28-31
+- Rename __atomic_compare_exchange to not clash with gcc built-in
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.28-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild