diff --git a/databases/py-berkeleydb/Makefile b/databases/py-berkeleydb/Makefile
index 8679ebb39f7d..a3c4e26d6558 100644
--- a/databases/py-berkeleydb/Makefile
+++ b/databases/py-berkeleydb/Makefile
@@ -1,41 +1,41 @@
 # Created by: Hye-Shik Chang <perky@python.or.kr>
 
 PORTNAME=	berkeleydb
-PORTVERSION=	18.1.2
+PORTVERSION=	18.1.4
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python bindings for Oracle Berkeley DB
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		bdb python:3.6+
 USE_PYTHON=	distutils autoplist
 
 PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
 PYDISTUTILS_BUILDARGS=	--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
 PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%DBVERSION%%|${BDB_LIB_NAME}| ; \
 		s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}| ; \
 		s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|' \
 		${WRKSRC}/setup3.py
-	@${REINPLACE_CMD} 's|<db\.h>|<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Modules/berkeleydb.h
+	@${REINPLACE_CMD} 's|<db\.h>|<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Module/berkeleydb.h
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./test.py
 
 .include <bsd.port.mk>
diff --git a/databases/py-berkeleydb/distinfo b/databases/py-berkeleydb/distinfo
index 3205d2dd4aa9..815905527a76 100644
--- a/databases/py-berkeleydb/distinfo
+++ b/databases/py-berkeleydb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613155635
-SHA256 (berkeleydb-18.1.2.tar.gz) = b617a8f8562a36e5a395beb93e07a0905dd5e68e7ba2e87916a740db9126470e
-SIZE (berkeleydb-18.1.2.tar.gz) = 168233
+TIMESTAMP = 1621889489
+SHA256 (berkeleydb-18.1.4.tar.gz) = 3f6da579e727cdec7cdf192feaeb2ad58dca7a8479902f20cc2d73b2027b9e54
+SIZE (berkeleydb-18.1.4.tar.gz) = 129690
diff --git a/databases/py-berkeleydb/files/patch-setup3.py b/databases/py-berkeleydb/files/patch-setup3.py
index 8991b8079829..5fb8600126b4 100644
--- a/databases/py-berkeleydb/files/patch-setup3.py
+++ b/databases/py-berkeleydb/files/patch-setup3.py
@@ -1,34 +1,31 @@
---- setup3.py.orig	2020-12-07 19:17:41 UTC
+--- setup3.py.orig	2021-05-19 15:44:48 UTC
 +++ setup3.py
-@@ -41,10 +41,7 @@ import sys
- import glob
- 
- 
--try :
--  from setuptools import setup, Extension
--except Exception:
--  from distutils.core import setup, Extension
+@@ -44,7 +44,7 @@ import glob
+ # See https://setuptools.readthedocs.io/en/latest/deprecated/\
+ #                                      distutils-legacy.html
+ os.environ['SETUPTOOLS_USE_DISTUTILS'] = 'local'
+-from setuptools import setup, Extension
 +from distutils.core import setup, Extension
- 
- from distutils.dep_util import newer
  import distutils.ccompiler
-@@ -258,8 +255,8 @@ if os.name == 'posix':
+ 
+ # read the module version number out of the .c file
+@@ -256,8 +256,8 @@ if os.name == 'posix':
          incdir = os.path.join(BERKELEYDB_DIR, 'include')
      if not libdir:
          libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = [dblib]
 +    if not '-l%%BDB_LIB_NAME%%' in LIBS:
 +        libname = ['%%BDB_LIB_NAME%%']
      else:
          if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
          libname = []
-@@ -298,7 +295,7 @@ if os.name == 'posix':
+@@ -296,7 +296,7 @@ if os.name == 'posix':
  
      # read db.h to figure out what version of Oracle Berkeley DB this is
      ver = None
 -    with open(os.path.join(incdir, 'db.h'), 'r') as f :
 +    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
          db_h_lines = f.readlines()
      db_ver_re = re.compile(
          r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')