diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 52d89d1ac1e1..8fe63732aae3 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,8 +1,9 @@
 # Created by: KANOU Hiroki <kanou@khdd.net>
 
 PORTNAME=	fontforge
-PORTVERSION=	20201107
+DISTVERSION=	20201107
 CATEGORIES=	print
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
@@ -13,16 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		compiler:c++11-lang cmake cpe desktop-file-utils gettext gnome \
-		iconv:wchar_t pkgconfig shared-mime-info
-USE_GITHUB=	yes
+		iconv:wchar_t pkgconfig shared-mime-info tar:xz
 USE_GNOME=	cairo glib20 libxml2
-CMAKE_ARGS=	-DIconv_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
-		-DIconv_LIBRARY=${ICONV_LIB_PATH}
-
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
+CMAKE_ARGS=	-DIconv_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \
+		-DIconv_LIBRARY=${ICONV_LIB_PATH}
+
 OPTIONS_DEFINE=	DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \
 		TILEPATH UNINAMESLIST WOFF2 WRITEPFM
 OPTIONS_RADIO=	GUI
@@ -46,7 +46,7 @@ FREETYPE_CMAKE_ON=	-DENABLE_FREETYPE_DEBUGGER:PATH=${WRKSRC}/freetype
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CMAKE_BOOL=	ENABLE_LIBGIF
 
-GTK3_USE=	gnome=gtk30
+GTK3_USE=	gnome=gdkpixbuf2,gtk30
 
 JPEG_USES=	jpeg
 JPEG_CMAKE_BOOL=ENABLE_LIBJPEG
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 481152c4fa8d..2a4474a0a601 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609352128
-SHA256 (fontforge-fontforge-20201107_GH0.tar.gz) = 274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
-SIZE (fontforge-fontforge-20201107_GH0.tar.gz) = 19485522
+TIMESTAMP = 1642458860
+SHA256 (fontforge-20201107.tar.xz) = 68bcba8f602819eddc29cd356ee13fafbad7a80d19b652d354c6791343476c78
+SIZE (fontforge-20201107.tar.xz) = 14163424