diff --git a/db-32/.signature b/db-32/.signature
index 3bbf1c1a..c996470d 100644
--- a/db-32/.signature
+++ b/db-32/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXWOSLkooYU5c0RyiuGdYvuPq0n0xH6vP85HvpNWJD69sEoxDBb5tegNLMNheTvaUpegWjFBoa0hMpO1ePxCcaQY=
-SHA256 (Pkgfile) = 79e5b8d329ce333a6b38ba21ea6a05fbbcbab6951f89df0fb30c8713b4028b4c
+RWSwxGo/zH7eXbvf/nixuP3r4+iuM8+N7KGmy7gn8wpp61JGaTD0Njhz6dMYqV2SQSfPCVxp7Ss5kGG5a7+Qq5CW79Tme1YeEAY=
+SHA256 (Pkgfile) = 381b2022f6959ce8769407bc16167423d9df17fa31fffd609fb486827b4be62b
 SHA256 (.footprint) = f48dabc8d96d2d29b1e4772033c3f0056ebfe7498829bbb79da1db9267f16314
 SHA256 (db-5.3.28.tar.gz) = e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628
+SHA256 (0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch) = 696ac5af5473f0d85ecc6af44a85333c91500721fb5c33028c05e843429058d1
diff --git a/db-32/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch b/db-32/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
new file mode 100644
index 00000000..571708e0
--- /dev/null
+++ b/db-32/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
@@ -0,0 +1,45 @@
+From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 22 Mar 2017 15:32:26 +0000
+Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash
+ with builtins
+
+Helps building with clang
+
+Fixes
+
+../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange'
+static inline int __atomic_compare_exchange(
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/dbinc/atomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index 6a858f7..1b49de5 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;
+-- 
+1.8.3.1
+
diff --git a/db-32/Pkgfile b/db-32/Pkgfile
index bfdefaba..ef124bc4 100644
--- a/db-32/Pkgfile
+++ b/db-32/Pkgfile
@@ -1,14 +1,18 @@
 # Description: Berkeley DB
 # URL:         http://www.oracle.com/database/berkeley-db/index.html
-# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
+# Maintainer:  CRUX compat-32 Team, compat-32-ports at crux dot nu
 
 name=db-32
 version=5.3.28
-release=1
-source=(http://download.oracle.com/berkeley-db/db-$version.tar.gz)
+release=2
+source=(http://download.oracle.com/berkeley-db/db-$version.tar.gz
+	0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch)
 
 build() {
     cd db-$version/build_unix
+
+    patch -p1 -d .. -i $SRC/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+
     ../dist/configure --prefix=/usr \
 		--libdir=/usr/lib32 \
 		--enable-compat185 \
@@ -19,5 +23,5 @@ build() {
     make DESTDIR=$PKG install
     rm -r $PKG/usr/docs
     chmod -R +w $PKG
-	rm -rf $PKG/usr/{bin,include}
+    rm -rf $PKG/usr/{bin,include}
 }