diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 0961bd44b91a..6b3559b009ba 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -1,77 +1,79 @@
-# Created by: rbt@zort.on.ca
+# Created by: Rod Taylor <rbt@zort.on.ca>
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	1.1.15
-DISTVERSIONPREFIX=v
+PORTVERSION=	1.2.1
 CATEGORIES=	net-p2p
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK based Gnutella client
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 i386
+LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
-USES=		gnome iconv localbase:ldflags pkgconfig tar:xz
-USE_GITHUB=	yes
+USES=		gmake gnome iconv localbase:ldflags pkgconfig tar:xz
 USE_GNOME=	glib20 libxml2
-
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-O -Dyacc='byacc' \
 		-Dprefix='${PREFIX}' \
 		-Dprivlib='${DATADIR}' \
 		-Dmansrc='${MANPREFIX}/man/man1' \
 		-Dlocale='${PREFIX}/share/locale' \
 		-Dcc='${CC}' -Doptimize='${CFLAGS}' \
 		-Dccflags='${CPPFLAGS}' -Dldflags='${LDFLAGS}' \
 		-Dusemymalloc='n'
 MAKE_ARGS=	INSTALL_PREFIX="${STAGEDIR}"
 INSTALL_TARGET=	install install.man
 
 PLIST_SUB=	ARCH="${ARCH}" OPSYS="${OPSYS:tl}"
 
 OPTIONS_DEFINE=		DBUS DEBUG GUI IPV6 NLS PORTABILITY TLS
 OPTIONS_DEFAULT=	GUI TLS
 OPTIONS_SUB=		yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_OFF=	-Ud_dbus
 DEBUG_CONFIGURE_ON=	-Ud_official
 GUI_USE=		gnome=gtk20,cairo
 GUI_VARS=		INSTALLS_ICONS=yes
 GUI_CONFIGURE_OFF=	-Dd_headless
 GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 IPV6_CONFIGURE_OFF=	-Ud_ipv6
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	-Ud_nls
 PORTABILITY_DESC=	Use the PATH variable at run-time
 PORTABILITY_CONFIGURE_ON=	-Dd_portable
 TLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 TLS_CONFIGURE_OFF=	-Ud_gnutls
 
 .if !defined(INTERACTIVE_CONFIGURE)
 CONFIGURE_ARGS+=	-ders
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.SH" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@exit 0|@echo done|'
+# Use memory alignment constraints as in version 1.1.15 to unbreak the
+# build on 32-bit architectures
+	@${REINPLACE_CMD} -e 's,^#ifdef XMALLOC_IS_MALLOC,#if __SIZE_WIDTH__\
+		== 32,' ${WRKSRC}/src/lib/xmalloc.h
 
 post-patch-DEBUG-off:
 	@${REINPLACE_CMD} 's/(INSTALL) -c -m 555/(INSTALL) -c -s -m 555/g' \
 		${WRKSRC}/src/Makefile.SH
 
 post-install-GUI-on:
 .for i in 16 32 128 256 512
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.${i}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/gtk-gnutella.png)
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	(cd ${WRKSRC}/extra_files && ${INSTALL_DATA} gtk-gnutella.svg \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/gtk-gnutella.svg)
 
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 48a151a6e2e6..9ed89e85eb23 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565005144
-SHA256 (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = a72fd0b57bbc458c8fe5556bd171cd3cae940fa131c5783ab4114f29d85d9122
-SIZE (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = 22899323
+TIMESTAMP = 1626271947
+SHA256 (gtk-gnutella-1.2.1.tar.xz) = b76de8d1cd470966e322522539ccb9abb1b5c5f7c7f72af9acb95dff51bfbada
+SIZE (gtk-gnutella-1.2.1.tar.xz) = 20623440
diff --git a/net-p2p/gtk-gnutella/pkg-descr b/net-p2p/gtk-gnutella/pkg-descr
index 71bc4291f009..f00145abdb82 100644
--- a/net-p2p/gtk-gnutella/pkg-descr
+++ b/net-p2p/gtk-gnutella/pkg-descr
@@ -1,13 +1,12 @@
 GTK based Gnutella client which supports the standard Gnutella
 operations.
 
 Search, download, file sharing, bandwidth limiting, host caching, as
 well as some basic statistics. Now with enhanced features, such as PARQ
 queueing, PFSP, DHT, push-proxies, UPnP, NAT-PMP and others, making it a
 stable and fully functional graphical gnutella client for *nix systems.
 
 An excellent way to find that hidden file on the internet that you know
 exists but standard search engines do not seem to carry.
 
 WWW: http://gtk-gnutella.sourceforge.net/
-IRC: #gtk-gnutella on freenode.net