diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index 009038fa6a25..f66f106ef4b8 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	pg.el
-DISTVERSION=	0.13
-PORTREVISION=	4
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.16
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	PostgreSQL Elisp interface
-WWW=		https://github.com/cbbrowne/pg.el
+WWW=		https://github.com/emarsden/pg-el
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	cbbrowne
-GH_TAGNAME=	4f6516e
+GH_ACCOUNT=	emarsden
+GH_PROJECT=	pg-el
+GH_TAGNAME=	${DISTVERSIONPREFIX}${DISTVERSION}
 
 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
 
-PORTDOCS=	README
+PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	(cd ${WRKSRC} \
 	&& ${EMACS_CMD} -Q -batch -L . -f batch-byte-compile *.el)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
 	    ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${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 95f6ff3bd11f..faf725950899 100644
--- a/databases/pg.el/distinfo
+++ b/databases/pg.el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621273465
-SHA256 (cbbrowne-pg.el-0.13-4f6516e_GH0.tar.gz) = d040b0783c4700bd07b8cea803fb1da6e202979acbeeeea127cbe17784eafa6e
-SIZE (cbbrowne-pg.el-0.13-4f6516e_GH0.tar.gz) = 15299
+TIMESTAMP = 1667704920
+SHA256 (emarsden-pg-el-v0.16_GH0.tar.gz) = 4fd681aa5e588c9ff5282e2cc6cc5449cf9cc1f946582a44deddc5836ed08002
+SIZE (emarsden-pg-el-v0.16_GH0.tar.gz) = 28606