diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index 01ae208706e3..e686e39142c5 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	db46
-PORTVERSION=	4.6.21.0
+PORTVERSION=	4.6.21.1
 CATEGORIES=	databases
 MASTER_SITES=	http://download-west.oracle.com/berkeley-db/ \
 		http://download-east.oracle.com/berkeley-db/ \
@@ -15,6 +15,13 @@ PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
+PATCH_SITES=	http://www.oracle.com/technology/products/berkeley-db/xml/update/${PORTVERSION:R}/
+PATCHFILES=	patch.4.6.21.1
+PATCH_DIST_STRIP=	-d ..
+# * patch.4.6.21.1: -----------------------------------------------------------
+# Fixes a race condition between checkpoint and DB->close which can result in
+# the checkpoint thread self-deadlocking. [#15692]
+
 # I allow matthias.andree@gmx.de and all freebsd committer to do changes
 # to this package.
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/db46/distinfo b/databases/db46/distinfo
index 3c03c3a53f56..ffac2921cd74 100644
--- a/databases/db46/distinfo
+++ b/databases/db46/distinfo
@@ -1,3 +1,6 @@
 MD5 (bdb/db-4.6.21.tar.gz) = 718082e7e35fc48478a2334b0bc4cd11
 SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
 SIZE (bdb/db-4.6.21.tar.gz) = 11881885
+MD5 (bdb/patch.4.6.21.1) = 4878872edfc53c6ecb871b1062a4bdaf
+SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
+SIZE (bdb/patch.4.6.21.1) = 2475
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index 01ae208706e3..e686e39142c5 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	db46
-PORTVERSION=	4.6.21.0
+PORTVERSION=	4.6.21.1
 CATEGORIES=	databases
 MASTER_SITES=	http://download-west.oracle.com/berkeley-db/ \
 		http://download-east.oracle.com/berkeley-db/ \
@@ -15,6 +15,13 @@ PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
+PATCH_SITES=	http://www.oracle.com/technology/products/berkeley-db/xml/update/${PORTVERSION:R}/
+PATCHFILES=	patch.4.6.21.1
+PATCH_DIST_STRIP=	-d ..
+# * patch.4.6.21.1: -----------------------------------------------------------
+# Fixes a race condition between checkpoint and DB->close which can result in
+# the checkpoint thread self-deadlocking. [#15692]
+
 # I allow matthias.andree@gmx.de and all freebsd committer to do changes
 # to this package.
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/db47/distinfo b/databases/db47/distinfo
index 3c03c3a53f56..ffac2921cd74 100644
--- a/databases/db47/distinfo
+++ b/databases/db47/distinfo
@@ -1,3 +1,6 @@
 MD5 (bdb/db-4.6.21.tar.gz) = 718082e7e35fc48478a2334b0bc4cd11
 SHA256 (bdb/db-4.6.21.tar.gz) = 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
 SIZE (bdb/db-4.6.21.tar.gz) = 11881885
+MD5 (bdb/patch.4.6.21.1) = 4878872edfc53c6ecb871b1062a4bdaf
+SHA256 (bdb/patch.4.6.21.1) = d28c0723c465a2cf3ff2ddc5ed3c643b40c955c4e64d56580961f2fd799cbb53
+SIZE (bdb/patch.4.6.21.1) = 2475