diff --git a/audio/libremidi/Makefile b/audio/libremidi/Makefile
index f9228d9da044..b3cd32e0a678 100644
--- a/audio/libremidi/Makefile
+++ b/audio/libremidi/Makefile
@@ -1,25 +1,28 @@
 PORTNAME=	libremidi
-DISTVERSION=	g20230630
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.0
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modern C++ MIDI real-time & file I/O library
 WWW=		https://github.com/jcelerier/libremidi
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.ModernMidi
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libjack.so:audio/jack
+TEST_DEPENDS=	catch2>0:devel/catch2
 
-USES=		cmake:testing
+USES=		cmake:testing compiler:c++20-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jcelerier
-GH_TAGNAME=	c4833ef
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	LIBREMIDI_TESTS
+CMAKE_TESTING_ON=	LIBREMIDI_TESTS # 2 tests fail, see https://github.com/jcelerier/libremidi/issues/72
 
 # This library can also be used as a header-only library
 
 .include <bsd.port.mk>
diff --git a/audio/libremidi/distinfo b/audio/libremidi/distinfo
index b35cb8fb231c..bf3889f733b6 100644
--- a/audio/libremidi/distinfo
+++ b/audio/libremidi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1688140390
-SHA256 (jcelerier-libremidi-g20230630-c4833ef_GH0.tar.gz) = 89bd791321087e61d1cc575a3b2d2f88731a0e9335f0c1d93eab6dd41a11e319
-SIZE (jcelerier-libremidi-g20230630-c4833ef_GH0.tar.gz) = 15467125
+TIMESTAMP = 1689054483
+SHA256 (jcelerier-libremidi-v3.0_GH0.tar.gz) = 133b40396ca72e35d94cb0950199c9d123352951e4705971a9cd7606f905328a
+SIZE (jcelerier-libremidi-v3.0_GH0.tar.gz) = 15466588