diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile
index f1f6d95e0f76..651da25360dc 100644
--- a/devel/ghub-devel/Makefile
+++ b/devel/ghub-devel/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.6-50
-DISTVERSIONSUFFIX=	-g6a5de97
+DISTVERSION=	3.6.0
+DISTVERSIONSUFFIX=
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Client libraries for the APIs of various Git forges
 WWW=		https://github.com/magit/ghub
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}
-RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.3.4:misc/compat.el@${EMACS_FLAVOR} \
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
 		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2: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 ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ."
+MAKE_ARGS=	LOAD_PATH=" -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ."
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	ghub-emacs*
 
 NO_ARCH=	yes
 
 INFO=		ghub
 PORTDOCS=	CHANGELOG README.org ghub.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/ghub.pdf
 
 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} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/ghub.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/ghub.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub-devel/distinfo b/devel/ghub-devel/distinfo
index 29ffb7e78842..734b4c37af09 100644
--- a/devel/ghub-devel/distinfo
+++ b/devel/ghub-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683781860
-SHA256 (magit-ghub-v3.5.6-50-g6a5de97_GH0.tar.gz) = 02fbc68c515b783a7686c6bf9f26c73ac76df6bc84e6127ae79224dd112fd719
-SIZE (magit-ghub-v3.5.6-50-g6a5de97_GH0.tar.gz) = 62612
+TIMESTAMP = 1683997096
+SHA256 (magit-ghub-v3.6.0_GH0.tar.gz) = b43fe03c6cd66db48c312661dd5fe671736f1b24cf7f0caebd2f334807932edd
+SIZE (magit-ghub-v3.6.0_GH0.tar.gz) = 62572
diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile
index 0c57b1f02d36..5aaddb4c9896 100644
--- a/devel/ghub/Makefile
+++ b/devel/ghub/Makefile
@@ -1,64 +1,66 @@
 PORTNAME=	ghub
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.6
-PORTREVISION=	5
+DISTVERSION=	3.6.0
 CATEGORIES=	devel elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Client libraries for the APIs of various Git forges
 WWW=		https://github.com/magit/ghub
 
 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}
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
+		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2:devel/treepy.el@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.1:misc/compat.el@${EMACS_FLAVOR} \
+		treepy.el${EMACS_PKGNAMESUFFIX}>=0.1.2: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 ."
+MAKE_ARGS=	LOAD_PATH=" -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L ."
+MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	lisp info
 
 CONFLICTS_INSTALL=	ghub-emacs*
 
 NO_ARCH=	yes
 
 INFO=		ghub
-PORTDOCS=	CHANGELOG README.md ghub.html
+PORTDOCS=	CHANGELOG README.org ghub.html
 
 OPTIONS_DEFINE=	DOCS PDF
 
 PDF_DESC=	Build and install PDF document
 
 DOCS_BUILD_DEPENDS=	gsed:textproc/gsed
 DOCS_ALL_TARGET=	html
 DOCS_BINARY_ALIAS=	sed=gsed
 PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
 PDF_USES=		tex
 PDF_USE=		TEX=dvipdfmx:build
 PDF_ALL_TARGET=		pdf
 PDF_PLIST_FILES=	${DOCSDIR}/ghub.pdf
 
 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} ${ELISP_FILES:C/^/${WRKSRC}\/lisp\//} \
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.md \
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.org \
 		${WRKSRC}/docs/ghub.html ${STAGEDIR}${DOCSDIR}
 
 do-install-PDF-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/ghub.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ghub/distinfo b/devel/ghub/distinfo
index de6110538ab1..b8d0598579db 100644
--- a/devel/ghub/distinfo
+++ b/devel/ghub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648212121
-SHA256 (magit-ghub-v3.5.6_GH0.tar.gz) = 0d5bd0b83f19459cf427d562a46ecfc9e1e8b52c584c96e34f5f39197fcda9cf
-SIZE (magit-ghub-v3.5.6_GH0.tar.gz) = 59474
+TIMESTAMP = 1683997386
+SHA256 (magit-ghub-v3.6.0_GH0.tar.gz) = b43fe03c6cd66db48c312661dd5fe671736f1b24cf7f0caebd2f334807932edd
+SIZE (magit-ghub-v3.6.0_GH0.tar.gz) = 62572