diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile
index 8de00940916f..f4f2ab52fd63 100644
--- a/devel/ghub/Makefile
+++ b/devel/ghub/Makefile
@@ -1,46 +1,44 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.4
-PORTREVISION=	1
+DISTVERSION=	3.5.5
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
-COMMENT=	Minuscule client library for the Github API
+COMMENT=	Client libraries for the APIs of various Git forges
 
 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 ."
+ALL_TARGET=	lisp info
 
 NO_ARCH=	yes
 
 INFO=		ghub
-PORTDOCS=	README.md
+PORTDOCS=	CHANGELOG 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}
-.for f in ${ELISP_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} \
+	${INSTALL_DATA} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub/distinfo b/devel/ghub/distinfo
index 761f459a86aa..a3793e26fa54 100644
--- a/devel/ghub/distinfo
+++ b/devel/ghub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633135151
-SHA256 (magit-ghub-v3.5.4_GH0.tar.gz) = adfa59695a4f72b96f72c5f50f9ce44ee21d43d29d24194dbc1225ee7fbfd032
-SIZE (magit-ghub-v3.5.4_GH0.tar.gz) = 58088
+TIMESTAMP = 1645075735
+SHA256 (magit-ghub-v3.5.5_GH0.tar.gz) = 8d167514ba15e3f6e3bf7c7ad7c4d024cde76134ceb7589e474d3ef0bf334aa6
+SIZE (magit-ghub-v3.5.5_GH0.tar.gz) = 59247