diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile
index 426881bf8992..8c1518015291 100644
--- a/graphics/birdfont/Makefile
+++ b/graphics/birdfont/Makefile
@@ -1,58 +1,52 @@
 PORTNAME=	birdfont
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.29.6
+DISTVERSION=	2.32.2
 CATEGORIES=	graphics x11-fonts
+MASTER_SITES=	https://birdfont.org/releases/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Editor for vector graphics and TTF, OTF, EOT and SVG fonts
+MAINTAINER=	eduardo@FreeBSD.org
+COMMENT=	Font editor for creating fonts in TTF, EOT, SVG and BIRDFONT format
 WWW=		https://birdfont.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPLv3.txt
 
-# Seems to be a Vala problem: there is no string
-# "BIRD_FONT_TEST_BIRD_FONT_NOT_STARTED" in the source code;
-# there's only "NOT_STARTED".
-BROKEN=	build/libbirdfont/TestBirdFont.c:107:46: error: use of undeclared identifier 'BIRD_FONT_TEST_BIRD_FONT_NOT_STARTED'
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR}
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgee-0.8.so:devel/libgee \
 		libharfbuzz.so:print/harfbuzz \
 		libnotify.so:devel/libnotify \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libxmlbird.so:textproc/libxmlbird
 
-USES=		compiler:c++11-lang gettext-tools gnome pkgconfig \
-		python:3.7+,build shared-mime-info shebangfix sqlite:3 tar:xz vala:build
-USE_GITHUB=	yes
-GH_ACCOUNT=	johanmattssonm
+USES=		compiler:c++11-lang desktop-file-utils gettext-tools gnome \
+		pkgconfig python:3.7+,build shared-mime-info shebangfix \
+		sqlite:3 tar:xz vala:build
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	configure install.py
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--cflags="${CFLAGS}" \
 		--dest="${STAGEDIR}" \
 		--ldflags="${LDFLAGS}" \
 		--prefix="${PREFIX}"
 
 _STRIPPABLE=	bin/birdfont bin/birdfont-autotrace bin/birdfont-export \
 		bin/birdfont-import lib/libbirdfont.so.36.0 \
 		lib/libbirdgems.so.0.0
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} build.py)
 
 do-install:
 	(cd ${WRKSRC} && ./install.py \
 		--dest="${STAGEDIR}" \
 		--nogzip=1 \
 		--manpages-directory="/share/man/man1")
 	@(cd ${STAGEDIR}${PREFIX} && \
 		${STRIP_CMD} ${_STRIPPABLE})
 
 .include <bsd.port.mk>
diff --git a/graphics/birdfont/distinfo b/graphics/birdfont/distinfo
index 55488a9b80c3..2f5bc1af62be 100644
--- a/graphics/birdfont/distinfo
+++ b/graphics/birdfont/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642688359
-SHA256 (johanmattssonm-birdfont-v2.29.6_GH0.tar.gz) = 5212b57b65b2b20cd343fe4595f4bb381a4c8f40a27c150f7cfc22bc1afe590e
-SIZE (johanmattssonm-birdfont-v2.29.6_GH0.tar.gz) = 4754570
+TIMESTAMP = 1663883492
+SHA256 (birdfont-2.32.2.tar.xz) = 875dffec9108a9f2292a184fbc7db19468f909299c2eaa9a92618ec7d983d272
+SIZE (birdfont-2.32.2.tar.xz) = 2570524
diff --git a/graphics/birdfont/pkg-plist b/graphics/birdfont/pkg-plist
index 20a7408645fd..008019722ee0 100644
--- a/graphics/birdfont/pkg-plist
+++ b/graphics/birdfont/pkg-plist
@@ -1,50 +1,36 @@
 bin/birdfont
 bin/birdfont-autotrace
 bin/birdfont-export
 bin/birdfont-import
 lib/libbirdfont.so
 lib/libbirdfont.so.36
 lib/libbirdfont.so.36.0
 lib/libbirdgems.so
 lib/libbirdgems.so.0
 lib/libbirdgems.so.0.0
 share/applications/birdfont.desktop
 %%DATADIR%%/Roboto-Regular.ttf
 %%DATADIR%%/birdfont_window_icon.png
 %%DATADIR%%/bright.theme
 %%DATADIR%%/codepages.sqlite
 %%DATADIR%%/dark.theme
 %%DATADIR%%/high_contrast.theme
 %%DATADIR%%/icons.birdfont
 %%DATADIR%%/key_bindings.xml
 %%DATADIR%%/ucd.sqlite
 share/icons/hicolor/128x128/apps/birdfont.png
 share/icons/hicolor/256x256/apps/birdfont.png
 share/icons/hicolor/48x48/apps/birdfont.png
 share/locale/cs/LC_MESSAGES/birdfont.mo
 share/locale/de/LC_MESSAGES/birdfont.mo
-share/locale/el/LC_MESSAGES/birdfont.mo
 share/locale/es/LC_MESSAGES/birdfont.mo
-share/locale/fi/LC_MESSAGES/birdfont.mo
-share/locale/fr/LC_MESSAGES/birdfont.mo
-share/locale/he/LC_MESSAGES/birdfont.mo
-share/locale/id/LC_MESSAGES/birdfont.mo
 share/locale/it/LC_MESSAGES/birdfont.mo
-share/locale/nb/LC_MESSAGES/birdfont.mo
 share/locale/nl/LC_MESSAGES/birdfont.mo
-share/locale/oc/LC_MESSAGES/birdfont.mo
-share/locale/pl/LC_MESSAGES/birdfont.mo
-share/locale/pt/LC_MESSAGES/birdfont.mo
 share/locale/pt_BR/LC_MESSAGES/birdfont.mo
-share/locale/ru/LC_MESSAGES/birdfont.mo
-share/locale/sk/LC_MESSAGES/birdfont.mo
-share/locale/sr/LC_MESSAGES/birdfont.mo
 share/locale/sv/LC_MESSAGES/birdfont.mo
-share/locale/tr/LC_MESSAGES/birdfont.mo
-share/locale/uk/LC_MESSAGES/birdfont.mo
 share/man/man1/birdfont-autotrace.1.gz
 share/man/man1/birdfont-export.1.gz
 share/man/man1/birdfont-import.1.gz
 share/man/man1/birdfont.1.gz
 share/metainfo/birdfont.appdata.xml
 share/mime/packages/birdfont.xml