diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile
index c6a5b555de87..e65373d5b376 100644
--- a/databases/emacsql-devel/Makefile
+++ b/databases/emacsql-devel/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	emacsql
-DISTVERSION=	3.1.1-65
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-g5108c16
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.0.0
+DISTVERSIONSUFFIX=
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end (Development Version)
 WWW=		https://github.com/magit/emacsql
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
-BUILD_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
-		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
+BUILD_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.18:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-RUN_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
-		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.18:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-emacs_*
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/emacsql-devel/distinfo b/databases/emacsql-devel/distinfo
index 68560a3262dc..d9e24e239b93 100644
--- a/databases/emacsql-devel/distinfo
+++ b/databases/emacsql-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714526152
-SHA256 (magit-emacsql-3.1.1-65-g5108c16_GH0.tar.gz) = e6cc67204d3fd51bd7611c53e55604d99bfea9f21d5acc1d2698407d311fb54d
-SIZE (magit-emacsql-3.1.1-65-g5108c16_GH0.tar.gz) = 2398804
+TIMESTAMP = 1723783904
+SHA256 (magit-emacsql-v4.0.0_GH0.tar.gz) = 6d229617feea8dff15dcd0d33c4794b6c3c3d5afaf3c5647e685559b0913cd0d
+SIZE (magit-emacsql-v4.0.0_GH0.tar.gz) = 2398791
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 54504f3385a9..9121ffa7183e 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	emacsql
-DISTVERSION=	3.1.1
-PORTREVISION=	9
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.0.0
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-PATCH_SITES=	https://github.com/magit/emacsql/commit/
-PATCHFILES=	3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch:-p1
-
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end
 WWW=		https://github.com/magit/emacsql
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
-BUILD_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
+BUILD_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.18:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-RUN_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.18:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-devel* emacsql-emacs_*
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
 	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/emacsql/distinfo b/databases/emacsql/distinfo
index d8772162e169..d9e24e239b93 100644
--- a/databases/emacsql/distinfo
+++ b/databases/emacsql/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1674094021
-SHA256 (magit-emacsql-3.1.1_GH0.tar.gz) = 82620a6e3a4e9d56047e9b099e1c3070a5a6aa6828ccde4fb7c3f262a11803f1
-SIZE (magit-emacsql-3.1.1_GH0.tar.gz) = 2392710
-SHA256 (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 488199703bcb8238742eb60583b815051c8d72d19513bf01093713d24bed34a5
-SIZE (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 2164
+TIMESTAMP = 1723783904
+SHA256 (magit-emacsql-v4.0.0_GH0.tar.gz) = 6d229617feea8dff15dcd0d33c4794b6c3c3d5afaf3c5647e685559b0913cd0d
+SIZE (magit-emacsql-v4.0.0_GH0.tar.gz) = 2398791
diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist
index afdd54299bac..034968dd773c 100644
--- a/databases/emacsql/pkg-plist
+++ b/databases/emacsql/pkg-plist
@@ -1,14 +1,20 @@
 bin/emacsql-sqlite
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc