diff --git a/security/py-certbot-dns-gandi/Makefile b/security/py-certbot-dns-gandi/Makefile
index f03b0833ce46..3fe96e03740a 100644
--- a/security/py-certbot-dns-gandi/Makefile
+++ b/security/py-certbot-dns-gandi/Makefile
@@ -1,30 +1,32 @@
-PORTNAME=	certbot-plugin-gandi
+PORTNAME=	certbot-dns-gandi
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bgupta@kde.org
 COMMENT=	Gandi LiveDNS plugin for Certbot
-WWW=		https://github.com/obynio/certbot-plugin-gandi
+WWW=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}
 
 USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 # Use GitHub to fetch the source, because PyPI apparently only contains
 # a wheel and not the source package.
 USE_GITHUB=	yes
 GH_ACCOUNT=	obynio
+GH_PROJECT=	certbot-plugin-gandi
 
 NO_ARCH=	yes
 
 .include "${.CURDIR}/../py-acme/version.mk"
 .include <bsd.port.mk>