diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile
index a87ca50cbdbf..0d1d35a2830a 100644
--- a/graphics/birdfont/Makefile
+++ b/graphics/birdfont/Makefile
@@ -1,52 +1,54 @@
 PORTNAME=	birdfont
-DISTVERSION=	2.29.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.29.4
 CATEGORIES=	graphics x11-fonts
-MASTER_SITES=	http://birdfont.org/releases/
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Editor for vector graphics and TTF, OTF, EOT and SVG fonts
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPLv3.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR} \
 		valac:lang/vala
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgee-0.8.so:devel/libgee \
 		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
+USE_GITHUB=	yes
+GH_ACCOUNT=	johanmattssonm
 USE_GNOME=	cairo glib20 gtk30
 INSTALLS_ICONS=	yes
 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} ${LOCALBASE}/bin/doit)
+	(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 f6c7cf25ce68..9d51b31e80f9 100644
--- a/graphics/birdfont/distinfo
+++ b/graphics/birdfont/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600852151
-SHA256 (birdfont-2.29.1.tar.xz) = d107802a90b4cc19cb9739ca4ff83b294fee9e294c9306285a37d5c5ee5d4018
-SIZE (birdfont-2.29.1.tar.xz) = 2588816
+TIMESTAMP = 1618520750
+SHA256 (johanmattssonm-birdfont-v2.29.4_GH0.tar.gz) = 3dc0fca51c2642c43a6f799901bc335116f5db9b4961791f66093701bc5366f9
+SIZE (johanmattssonm-birdfont-v2.29.4_GH0.tar.gz) = 4755968
diff --git a/graphics/birdfont/pkg-plist b/graphics/birdfont/pkg-plist
index 008019722ee0..20a7408645fd 100644
--- a/graphics/birdfont/pkg-plist
+++ b/graphics/birdfont/pkg-plist
@@ -1,36 +1,50 @@
 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