diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 61aa575b6f5f..7bc1c002c5ad 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,50 +1,47 @@
 PORTNAME=	emacsql
-DISTVERSION=	3.0.0-17
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	-g3747260
+DISTVERSION=	3.1.0
 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=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 
-USES=		emacs localbase:ldflags
+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}"
-ALL_TARGET=	binary compile
-TEST_TARGET=	check
+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/distinfo b/databases/emacsql/distinfo
index 448fa9ec740c..8e37f7a9f5f7 100644
--- a/databases/emacsql/distinfo
+++ b/databases/emacsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663524821
-SHA256 (magit-emacsql-3.0.0-17-g3747260_GH0.tar.gz) = bf84d2e2d12191e8ee8695bb517a00ab74190d350df9eec6689516801b77a7a1
-SIZE (magit-emacsql-3.0.0-17-g3747260_GH0.tar.gz) = 2057124
+TIMESTAMP = 1665512052
+SHA256 (magit-emacsql-3.1.0_GH0.tar.gz) = 136914cf4fe8a261a2a4134699eefac694fa87b4d3406d531535f9a53dadb421
+SIZE (magit-emacsql-3.1.0_GH0.tar.gz) = 2392731
diff --git a/databases/emacsql/files/patch-Makefile b/databases/emacsql/files/patch-Makefile
deleted file mode 100644
index f3ffc1349e85..000000000000
--- a/databases/emacsql/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	2021-05-17 18:22:23 UTC
-+++ Makefile
-@@ -7,8 +7,7 @@
- .POSIX:
- .SUFFIXES: .el .elc
- EMACS   = emacs
--LDFLAGS = -L ../pg
--BATCH   = $(EMACS) -batch -Q -L . -L tests $(LDFLAGS)
-+BATCH   = $(EMACS) -batch -Q -L . -L tests $(LOAD_PATH)
- 
- EL = emacsql-compiler.el \
-      emacsql.el \
diff --git a/databases/emacsql/files/patch-sqlite_Makefile b/databases/emacsql/files/patch-sqlite_Makefile
index 463df817ee70..7408786dead2 100644
--- a/databases/emacsql/files/patch-sqlite_Makefile
+++ b/databases/emacsql/files/patch-sqlite_Makefile
@@ -1,22 +1,24 @@
---- sqlite/Makefile.orig	2020-07-14 00:28:59 UTC
+--- sqlite/Makefile.orig	2022-10-11 15:22:51 UTC
 +++ sqlite/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
+ -include ../.config.mk
+ 
  .POSIX:
 -LDLIBS = -ldl -lm
--CFLAGS = -O2 -Wall -Wextra \
+-CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
 +LDLIBS = -lsqlite3
 +CFLAGS += \
      -DSQLITE_THREADSAFE=0 \
      -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
      -DSQLITE_ENABLE_FTS5 \
-@@ -10,8 +10,8 @@ CFLAGS = -O2 -Wall -Wextra \
+@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
      -DSQLITE_ENABLE_JSON1 \
      -DSQLITE_SOUNDEX
  
 -emacsql-sqlite: emacsql.c sqlite3.c
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c sqlite3.c $(LDLIBS)
 +emacsql-sqlite: emacsql.c
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c $(LDLIBS)
  
  clean:
  	rm -f emacsql-sqlite
diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist
index c80325c828a1..afdd54299bac 100644
--- a/databases/emacsql/pkg-plist
+++ b/databases/emacsql/pkg-plist
@@ -1,13 +1,14 @@
 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.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc