diff --git a/www/buku/Makefile b/www/buku/Makefile
index 3f61d23b9240..32877bdb03ae 100644
--- a/www/buku/Makefile
+++ b/www/buku/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	buku
-PORTVERSION=	4.7.1
+PORTVERSION=	4.8
+DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
-MASTER_SITES=	PYPI
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Powerful command-line bookmark manager
 WWW=		https://github.com/jarun/buku
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1:www/py-beautifulsoup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.23,1:net/py-urllib3@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python:3.7+
 USE_PYTHON=	autoplist distutils noflavors
 
 NO_ARCH=	yes
 
 PLIST_FILES=	share/man/man1/buku.1.gz
 
-OPTIONS_DEFINE= CA_CERTIFICATES
+USE_GITHUB=	yes
+GH_ACCOUNT=	jarun
+
 OPTIONS_MULTI=	COMPLETION
 OPTIONS_MULTI_COMPLETION=	BASH FISH ZSH
-OPTIONS_DEFAULT=BASH CA_CERTIFICATES FISH ZSH
+OPTIONS_DEFAULT=BASH FISH ZSH
 BASH_DESC=		Install bash completion
-CA_CERTIFICATES_DESC=	CA certificates support
 FISH_DESC=		Install fish completion
 ZSH_DESC=		Install zsh completion
 
 BASH_PLIST_FILES=	etc/bash_completion.d/buku-completion.bash
-CA_CERTIFICATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}
 FISH_PLIST_FILES=	share/fish/completions/buku.fish
 ZSH_PLIST_FILES=	share/zsh/site-functions/_buku
 
 post-extract:
 	@${RM} -r ${WRKSRC}/bukuserver
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/buku.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/auto-completion/bash/buku-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/buku-completion.bash
 
 post-install-FISH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${WRKSRC}/auto-completion/fish/buku.fish ${STAGEDIR}${PREFIX}/share/fish/completions/buku.fish
 
 post-install-ZSH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/auto-completion/zsh/_buku ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_buku
 
 .include <bsd.port.mk>
diff --git a/www/buku/distinfo b/www/buku/distinfo
index 8c10f270f154..67d9f1a78c46 100644
--- a/www/buku/distinfo
+++ b/www/buku/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1657292476
-SHA256 (buku-4.7.1.tar.gz) = e7f3a1024a4b926e4480a32cb798f0ce3501961efcd15442616cfebeb777c916
-SIZE (buku-4.7.1.tar.gz) = 225845
+TIMESTAMP = 1681052914
+SHA256 (jarun-buku-v4.8_GH0.tar.gz) = a0b94210e80e9f9f359e5308323837d41781cf8dba497341099d5c59e27fa52c
+SIZE (jarun-buku-v4.8_GH0.tar.gz) = 591883