diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile
index 4054f5b1e7bf..a4f96fa27d20 100644
--- a/devel/ghub/Makefile
+++ b/devel/ghub/Makefile
@@ -1,40 +1,45 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.3
-PORTREVISION=	1
+DISTVERSION=	3.5.4
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Minuscule client library for the Github API
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 RUN_DEPENDS=	treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.1:devel/treepy.el@${EMACS_FLAVOR}
 
 USES=		emacs gmake makeinfo
 USE_GITHUB=	yes
 GH_ACCOUNT=	magit
 
 MAKE_ARGS=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ."
 
 NO_ARCH=	yes
 
 INFO=		ghub
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
+ELISP_FILES=	buck.el buck.elc ghub-autoloads.el ghub-graphql.el \
+		ghub-graphql.elc ghub.el ghub.elc glab.el glab.elc gogs.el \
+		gogs.elc gsexp.el gsexp.elc gtea.el gtea.elc
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/*.el* \
+.for f in ${ELISP_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub/distinfo b/devel/ghub/distinfo
index 34692ca7d59b..761f459a86aa 100644
--- a/devel/ghub/distinfo
+++ b/devel/ghub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622050684
-SHA256 (magit-ghub-v3.5.3_GH0.tar.gz) = 833ae348594d09755c864d68ca843ccce74718ab90a8455ef03c186e939f3d37
-SIZE (magit-ghub-v3.5.3_GH0.tar.gz) = 57896
+TIMESTAMP = 1633135151
+SHA256 (magit-ghub-v3.5.4_GH0.tar.gz) = adfa59695a4f72b96f72c5f50f9ce44ee21d43d29d24194dbc1225ee7fbfd032
+SIZE (magit-ghub-v3.5.4_GH0.tar.gz) = 58088
diff --git a/devel/ghub/pkg-plist b/devel/ghub/pkg-plist
index 734c0707d585..361c139c979c 100644
--- a/devel/ghub/pkg-plist
+++ b/devel/ghub/pkg-plist
@@ -1,16 +1,15 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/buck.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/buck.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-autoloads.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-graphql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-graphql.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub-pkg.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/ghub.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/glab.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/glab.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gogs.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gogs.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gsexp.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gsexp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gtea.el
 %%EMACS_VERSION_SITE_LISPDIR%%/ghub/gtea.elc