diff --git a/audio/mamba/Makefile b/audio/mamba/Makefile
index b9ba6d59da40..1aade1e6daee 100644
--- a/audio/mamba/Makefile
+++ b/audio/mamba/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	mamba
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1
+DISTVERSION=	2.1-9
+DISTVERSIONSUFFIX=	-gf9e08b2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -9,6 +10,7 @@ COMMENT=	Virtual MIDI keyboard
 LICENSE=	BSD0CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	xxd:editors/vim-console
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfluidsynth.so:audio/fluidsynth \
 		libjack.so:audio/jack \
@@ -18,12 +20,11 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 USES=		compiler:c++11-lang desktop-file-utils gmake gnome pkgconfig xorg
 USE_GNOME=	cairo glib20 libsigc++20
 USE_XORG=	x11
-USE_BINUTILS=	yes # linking needs some GNU features, fails on 12 without this, see https://github.com/brummer10/GxPlugins.lv2/issues/9
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brummer10
 GH_PROJECT=	Mamba
-GH_TUPLE=	brummer10:libxputty:b00d05c:libxputty/libxputty
+GH_TUPLE=	brummer10:libxputty:5c69824:libxputty/libxputty
 
 PLIST_FILES=	bin/mamba \
 		share/applications/Mamba.desktop \
diff --git a/audio/mamba/distinfo b/audio/mamba/distinfo
index d6a41c508e63..0971db0b5e76 100644
--- a/audio/mamba/distinfo
+++ b/audio/mamba/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1618035292
-SHA256 (brummer10-Mamba-v2.1_GH0.tar.gz) = bdcff972d4ff6e0209bd21ca417d8a941939dd2137d0f715580e9caf5fb39470
-SIZE (brummer10-Mamba-v2.1_GH0.tar.gz) = 133940
-SHA256 (brummer10-libxputty-b00d05c_GH0.tar.gz) = 6935d613abba4a94782adb89a8322821921d53715ee282edf0c5661591942cd5
-SIZE (brummer10-libxputty-b00d05c_GH0.tar.gz) = 496688
+TIMESTAMP = 1618045276
+SHA256 (brummer10-Mamba-v2.1-9-gf9e08b2_GH0.tar.gz) = ba635b57ed271907e6d192d198ac862107989e2d73193067c0801ecbc157f816
+SIZE (brummer10-Mamba-v2.1-9-gf9e08b2_GH0.tar.gz) = 134551
+SHA256 (brummer10-libxputty-5c69824_GH0.tar.gz) = 00913a9c3c18efba6b596ef1d9f891e9259ed94794c3f1d7e79aca1fb1bb002e
+SIZE (brummer10-libxputty-5c69824_GH0.tar.gz) = 523105