diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile
index a27cfd9ef88a..f36cc86f9f09 100644
--- a/graphics/jpegoptim/Makefile
+++ b/graphics/jpegoptim/Makefile
@@ -1,31 +1,33 @@
 # Created by: Devaux Fabien <fab@gcu.info>
 
 PORTNAME=	jpegoptim
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.7
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.kokkonen.net/tjko/src/ \
-		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Utility to optimize jpeg files
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USES=		cpe jpeg
 CPE_VENDOR=	${PORTNAME}_project
+USE_GITHUB=	yes
+GH_ACCOUNT=	tjko
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libjpeg=${LOCALBASE}
 
-PLIST_FILES=	bin/jpegoptim man/man1/jpegoptim.1.gz
-
 MAKE_ENV+=	INSTALL_ROOT=${STAGEDIR}
 
+PLIST_FILES=	bin/jpegoptim \
+		man/man1/jpegoptim.1.gz
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^bindir =.*$$|bindir = @bindir@|g ; \
 		 s|^mandir =.*$$|mandir = @mandir@|g ; \
 		 s|$$(INSTALL) -m 755|$$(INSTALL_PROGRAM)|g ; \
 	         s|$$(INSTALL) -m 644|$$(INSTALL_DATA)|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/jpegoptim/distinfo b/graphics/jpegoptim/distinfo
index 9a714431dbfc..b0cd0250ad99 100644
--- a/graphics/jpegoptim/distinfo
+++ b/graphics/jpegoptim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524148521
-SHA256 (jpegoptim-1.4.6.tar.gz) = 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
-SIZE (jpegoptim-1.4.6.tar.gz) = 99004
+TIMESTAMP = 1650529812
+SHA256 (tjko-jpegoptim-v1.4.7_GH0.tar.gz) = c52616f2fb8d481315871680f9943b0f58c553d1e0c49a6bd4691a3e66d7e6de
+SIZE (tjko-jpegoptim-v1.4.7_GH0.tar.gz) = 109026