diff --git a/graphics/libpgf/Makefile b/graphics/libpgf/Makefile
index a9d63808fad9..cd6638fec88e 100644
--- a/graphics/libpgf/Makefile
+++ b/graphics/libpgf/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	libpgf
-PORTVERSION=	7.15.32
+PORTVERSION=	7.21.7
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-latest/ \
-		SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
-DISTNAME=	libPGF-codec-and-console-src
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+DISTNAME=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Progressive Graphics Format (PGF) library
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf cpe dos2unix libtool pathfix zip
 USE_LDCONFIG=	yes
 
-DOS2UNIX_FILES=	configure.ac
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/PGF/Codec
+pre-configure:
+	@${MKDIR} ${WRKSRC}/m4
 
 .include <bsd.port.mk>
diff --git a/graphics/libpgf/distinfo b/graphics/libpgf/distinfo
index 95a2ebafc5aa..5d3a695dda98 100644
--- a/graphics/libpgf/distinfo
+++ b/graphics/libpgf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libPGF-codec-and-console-src.zip) = f1dd054b09b0f3651209d67529490b4cbc156a985d8b019ff3bfe575260f4221
-SIZE (libPGF-codec-and-console-src.zip) = 1268177
+TIMESTAMP = 1645833806
+SHA256 (libpgf-7.21.7/libpgf.zip) = cba8f7cd6f77adadf75e5ad39944e7490a00e5ae9a00cd2214119cb338c5abad
+SIZE (libpgf-7.21.7/libpgf.zip) = 2075722