diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 4194342d8a7b..effb4ff8bdfc 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	pg.el
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.36
-PORTREVISION=	1
+DISTVERSION=	0.39
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	PostgreSQL Elisp interface
 WWW=		https://github.com/emarsden/pg-el
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	peg.el${EMACS_PKGNAMESUFFIX}>1.0:devel/peg.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	peg.el${EMACS_PKGNAMESUFFIX}>1.0:devel/peg.el@${EMACS_FLAVOR}
 
 USES=		emacs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	emarsden
 GH_PROJECT=	pg-el
 
 CONFLICTS_INSTALL=	pg.el pg.el-emacs_* # share/doc/pg.el/README
 
 NO_ARCH=	yes
 
-PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/pg.el \
-		${EMACS_VERSION_SITE_LISPDIR}/pg.elc
+PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
+ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \
 	-f batch-byte-compile *.el)
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
-	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
+	    ${STAGEDIR}${PREFIX}/${ELISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/pg.el/distinfo b/databases/pg.el/distinfo
index f17f63168640..a2cecbad5d59 100644
--- a/databases/pg.el/distinfo
+++ b/databases/pg.el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719426481
-SHA256 (emarsden-pg-el-v0.36_GH0.tar.gz) = 69de0be79aeda4d7d7bc116e383d9fbb8aa325a362358bd3c153679eed3c3a9a
-SIZE (emarsden-pg-el-v0.36_GH0.tar.gz) = 94651
+TIMESTAMP = 1723783381
+SHA256 (emarsden-pg-el-v0.39_GH0.tar.gz) = b375234c397918922286c35cbcccd2d3a3b2388dd34212bca578a4d452f95591
+SIZE (emarsden-pg-el-v0.39_GH0.tar.gz) = 111328
diff --git a/databases/pg.el/pkg-plist b/databases/pg.el/pkg-plist
new file mode 100644
index 000000000000..130dbbba08bd
--- /dev/null
+++ b/databases/pg.el/pkg-plist
@@ -0,0 +1,8 @@
+%%ELISPDIR%%/pg-geometry.el
+%%ELISPDIR%%/pg-geometry.elc
+%%ELISPDIR%%/pg-gis.el
+%%ELISPDIR%%/pg-gis.elc
+%%ELISPDIR%%/pg-lo.el
+%%ELISPDIR%%/pg-lo.elc
+%%ELISPDIR%%/pg.el
+%%ELISPDIR%%/pg.elc