diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile
index e65373d5b376..698bb32e77b2 100644
--- a/databases/emacsql-devel/Makefile
+++ b/databases/emacsql-devel/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	emacsql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.3
 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.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.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 d9e24e239b93..9c30803b5de0 100644
--- a/databases/emacsql-devel/distinfo
+++ b/databases/emacsql-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723783904
-SHA256 (magit-emacsql-v4.0.0_GH0.tar.gz) = 6d229617feea8dff15dcd0d33c4794b6c3c3d5afaf3c5647e685559b0913cd0d
-SIZE (magit-emacsql-v4.0.0_GH0.tar.gz) = 2398791
+TIMESTAMP = 1725949045
+SHA256 (magit-emacsql-v4.0.3_GH0.tar.gz) = 8ff4ad04f433f6f55278822685e5c7a21e291d25e4502f6990c5b6c8e341009e
+SIZE (magit-emacsql-v4.0.3_GH0.tar.gz) = 2398435
diff --git a/databases/emacsql-devel/files/patch-emacsql-sqlite.el b/databases/emacsql-devel/files/patch-emacsql-sqlite.el
index 8ddae08ac1fe..4416fed2bae9 100644
--- a/databases/emacsql-devel/files/patch-emacsql-sqlite.el
+++ b/databases/emacsql-devel/files/patch-emacsql-sqlite.el
@@ -1,44 +1,36 @@
---- emacsql-sqlite.el.orig	2022-02-18 15:43:25 UTC
+--- emacsql-sqlite.el.orig	2024-09-06 13:42:34 UTC
 +++ emacsql-sqlite.el
-@@ -33,16 +33,7 @@
+@@ -35,16 +35,7 @@
      "sqlite/emacsql-sqlite")
    "Relative path to emacsql executable.")
  
 -(defvar emacsql-sqlite-executable
 -  (expand-file-name emacsql-sqlite-executable-path
 -                    (if (or (file-writable-p emacsql-sqlite-data-root)
 -                            (file-exists-p (expand-file-name
 -                                            emacsql-sqlite-executable-path
 -                                            emacsql-sqlite-data-root)))
 -                        emacsql-sqlite-data-root
 -                      (expand-file-name
 -                       (concat "emacsql/" emacsql-version)
 -                       user-emacs-directory)))
 +(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite"
    "Path to the EmacSQL backend (this is not the sqlite3 shell).")
  
- (defvar emacsql-sqlite-reserved
-@@ -100,6 +91,7 @@ used.")
-     (emacsql-wait connection)
-     (emacsql connection [:pragma (= busy-timeout $s1)]
-              (/ (* emacsql-global-timeout 1000) 2))
-+    (emacsql connection [:pragma (= foreign_keys 1)])
-     (emacsql-register connection)))
- 
- (cl-defun emacsql-sqlite (file &key debug)
-@@ -163,12 +155,12 @@ If called with non-nil ASYNC the return value is meani
+ (defvar emacsql-sqlite-c-compilers '("cc" "gcc" "clang")
+@@ -131,12 +122,12 @@ If called with non-nil ERROR, signal an error on failu
                        if path return it))
           (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
           (files (mapcar (lambda (f) (expand-file-name f src))
 -                        '("sqlite3.c" "emacsql.c")))
 +                        '("emacsql.c")))
           (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
           (ldlibs (cl-case system-type
                     (windows-nt (list))
 -                   (berkeley-unix (list "-lm"))
 -                   (otherwise (list "-lm" "-ldl"))))
 +                   (berkeley-unix (list "-lm" "-lsqlite3"))
 +                   (otherwise (list "-lm" "-ldl" "-lsqlite3"))))
           (options (emacsql-sqlite-compile-switches))
           (output (list "-o" emacsql-sqlite-executable))
           (arguments (nconc cflags options files ldlibs output)))
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 9121ffa7183e..f99f785fdaeb 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	emacsql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.3
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 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=	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.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 d9e24e239b93..6a74856e6c48 100644
--- a/databases/emacsql/distinfo
+++ b/databases/emacsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723783904
-SHA256 (magit-emacsql-v4.0.0_GH0.tar.gz) = 6d229617feea8dff15dcd0d33c4794b6c3c3d5afaf3c5647e685559b0913cd0d
-SIZE (magit-emacsql-v4.0.0_GH0.tar.gz) = 2398791
+TIMESTAMP = 1725948648
+SHA256 (magit-emacsql-v4.0.3_GH0.tar.gz) = 8ff4ad04f433f6f55278822685e5c7a21e291d25e4502f6990c5b6c8e341009e
+SIZE (magit-emacsql-v4.0.3_GH0.tar.gz) = 2398435
diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el
index 8ddae08ac1fe..4416fed2bae9 100644
--- a/databases/emacsql/files/patch-emacsql-sqlite.el
+++ b/databases/emacsql/files/patch-emacsql-sqlite.el
@@ -1,44 +1,36 @@
---- emacsql-sqlite.el.orig	2022-02-18 15:43:25 UTC
+--- emacsql-sqlite.el.orig	2024-09-06 13:42:34 UTC
 +++ emacsql-sqlite.el
-@@ -33,16 +33,7 @@
+@@ -35,16 +35,7 @@
      "sqlite/emacsql-sqlite")
    "Relative path to emacsql executable.")
  
 -(defvar emacsql-sqlite-executable
 -  (expand-file-name emacsql-sqlite-executable-path
 -                    (if (or (file-writable-p emacsql-sqlite-data-root)
 -                            (file-exists-p (expand-file-name
 -                                            emacsql-sqlite-executable-path
 -                                            emacsql-sqlite-data-root)))
 -                        emacsql-sqlite-data-root
 -                      (expand-file-name
 -                       (concat "emacsql/" emacsql-version)
 -                       user-emacs-directory)))
 +(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite"
    "Path to the EmacSQL backend (this is not the sqlite3 shell).")
  
- (defvar emacsql-sqlite-reserved
-@@ -100,6 +91,7 @@ used.")
-     (emacsql-wait connection)
-     (emacsql connection [:pragma (= busy-timeout $s1)]
-              (/ (* emacsql-global-timeout 1000) 2))
-+    (emacsql connection [:pragma (= foreign_keys 1)])
-     (emacsql-register connection)))
- 
- (cl-defun emacsql-sqlite (file &key debug)
-@@ -163,12 +155,12 @@ If called with non-nil ASYNC the return value is meani
+ (defvar emacsql-sqlite-c-compilers '("cc" "gcc" "clang")
+@@ -131,12 +122,12 @@ If called with non-nil ERROR, signal an error on failu
                        if path return it))
           (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
           (files (mapcar (lambda (f) (expand-file-name f src))
 -                        '("sqlite3.c" "emacsql.c")))
 +                        '("emacsql.c")))
           (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
           (ldlibs (cl-case system-type
                     (windows-nt (list))
 -                   (berkeley-unix (list "-lm"))
 -                   (otherwise (list "-lm" "-ldl"))))
 +                   (berkeley-unix (list "-lm" "-lsqlite3"))
 +                   (otherwise (list "-lm" "-ldl" "-lsqlite3"))))
           (options (emacsql-sqlite-compile-switches))
           (output (list "-o" emacsql-sqlite-executable))
           (arguments (nconc cflags options files ldlibs output)))