diff --git a/audio/libvgm/Makefile b/audio/libvgm/Makefile
index c45d7bf8f02b..1efe4f37b73f 100644
--- a/audio/libvgm/Makefile
+++ b/audio/libvgm/Makefile
@@ -1,30 +1,48 @@
 PORTNAME=	libvgm
-DISTVERSION=	g20240103
+DISTVERSION=	g20240608
 CATEGORIES=	audio
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	More modular rewrite of most components from VGMPlay
 WWW=		https://github.com/ValleyBell/libvgm
 
-USES=		cmake iconv pathfix
+USES=		cmake compiler:c++14-lang iconv pathfix
+USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ValleyBell
-GH_TAGNAME=	223b6f9d629feda1982dc4bbeebd19fa63b987fb
+GH_TAGNAME=	34c368c
 
 CMAKE_ON=	AUDIODRV_OSS
+CMAKE_OFF=	CMAKE_CXX_EXTENSIONS
+CMAKE_ARGS=	-DLIBRARY_TYPE=SHARED
 
-OPTIONS_DEFINE=		ALSA AO PULSEAUDIO
-OPTIONS_DEFAULT=	# none
+OPTIONS_DEFINE=		PLAYER VGM2WAV
+OPTIONS_DEFAULT=	PLAYER VGM2WAV
+OPTIONS_GROUP=		AUDIO
+OPTIONS_GROUP_AUDIO=	ALSA AO PULSEAUDIO
+OPTIONS_SUB=		yes
+
+PLAYER_DESC=		Build and install libvgm-player command
+VGM2WAV_DESC=		Build and install vgm2wav command
+AUDIO_DESC=		Additional audio backends support
+
+PLAYER_CMAKE_BOOL=	BUILD_PLAYER
+
+VGM2WAV_CMAKE_BOOL=	BUILD_VGM2WAV
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	AUDIODRV_ALSA
 
 AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CMAKE_BOOL=		AUDIODRV_LIBAO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_USES=	localbase:ldflags
 PULSEAUDIO_CMAKE_BOOL=	AUDIODRV_PULSE
 
+post-install-PLAYER-on:
+	${MV} ${STAGEDIR}${PREFIX}/bin/player \
+		${STAGEDIR}${PREFIX}/bin/libvgm-player
+
 .include <bsd.port.mk>
diff --git a/audio/libvgm/distinfo b/audio/libvgm/distinfo
index d5ec4993a131..afe86758fd47 100644
--- a/audio/libvgm/distinfo
+++ b/audio/libvgm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706527092
-SHA256 (ValleyBell-libvgm-g20240103-223b6f9d629feda1982dc4bbeebd19fa63b987fb_GH0.tar.gz) = fb1eebb0d75ac3203c5b7639e847dbcb0c306a852c874ff9ba64519b67fdae92
-SIZE (ValleyBell-libvgm-g20240103-223b6f9d629feda1982dc4bbeebd19fa63b987fb_GH0.tar.gz) = 1442014
+TIMESTAMP = 1725787643
+SHA256 (ValleyBell-libvgm-g20240608-34c368c_GH0.tar.gz) = 2673c7a1f3a6a5289929404dbfafa17f90710af7a637c2052b13371007bebc9c
+SIZE (ValleyBell-libvgm-g20240608-34c368c_GH0.tar.gz) = 1441492
diff --git a/audio/libvgm/pkg-plist b/audio/libvgm/pkg-plist
index d0abf1811573..c4acce313159 100644
--- a/audio/libvgm/pkg-plist
+++ b/audio/libvgm/pkg-plist
@@ -1,82 +1,82 @@
-bin/player
-bin/vgm2wav
+%%PLAYER%%bin/libvgm-player
+%%VGM2WAV%%bin/vgm2wav
 include/vgm/audio/AudioStream.h
 include/vgm/audio/AudioStream_SpcDrvFuns.h
 include/vgm/audio/AudioStructs.h
 include/vgm/common_def.h
 include/vgm/emu/EmuCores.h
 include/vgm/emu/EmuStructs.h
 include/vgm/emu/Resampler.h
 include/vgm/emu/SoundDevs.h
 include/vgm/emu/SoundEmu.h
 include/vgm/emu/cores/2151intf.h
 include/vgm/emu/cores/2413intf.h
 include/vgm/emu/cores/2612intf.h
 include/vgm/emu/cores/262intf.h
 include/vgm/emu/cores/ayintf.h
 include/vgm/emu/cores/c140.h
 include/vgm/emu/cores/c219.h
 include/vgm/emu/cores/c352.h
 include/vgm/emu/cores/c6280intf.h
 include/vgm/emu/cores/es5503.h
 include/vgm/emu/cores/es5506.h
 include/vgm/emu/cores/gb.h
 include/vgm/emu/cores/iremga20.h
 include/vgm/emu/cores/k051649.h
 include/vgm/emu/cores/k053260.h
 include/vgm/emu/cores/k054539.h
 include/vgm/emu/cores/mikey.h
 include/vgm/emu/cores/multipcm.h
 include/vgm/emu/cores/nesintf.h
 include/vgm/emu/cores/okim6258.h
 include/vgm/emu/cores/okim6295.h
 include/vgm/emu/cores/oplintf.h
 include/vgm/emu/cores/opnintf.h
 include/vgm/emu/cores/pokey.h
 include/vgm/emu/cores/pwm.h
 include/vgm/emu/cores/qsoundintf.h
 include/vgm/emu/cores/rf5cintf.h
 include/vgm/emu/cores/saaintf.h
 include/vgm/emu/cores/scsp.h
 include/vgm/emu/cores/segapcm.h
 include/vgm/emu/cores/sn764intf.h
 include/vgm/emu/cores/upd7759.h
 include/vgm/emu/cores/vsu.h
 include/vgm/emu/cores/ws_audio.h
 include/vgm/emu/cores/x1_010.h
 include/vgm/emu/cores/ym2151.h
 include/vgm/emu/cores/ymf271.h
 include/vgm/emu/cores/ymf278b.h
 include/vgm/emu/cores/ymz280b.h
 include/vgm/emu/dac_control.h
 include/vgm/emu/logging.h
 include/vgm/emu/snddef.h
 include/vgm/player/dblk_compr.h
 include/vgm/player/droplayer.hpp
 include/vgm/player/gymplayer.hpp
 include/vgm/player/helper.h
 include/vgm/player/playera.hpp
 include/vgm/player/playerbase.hpp
 include/vgm/player/s98player.hpp
 include/vgm/player/vgmplayer.hpp
 include/vgm/stdbool.h
 include/vgm/stdtype.h
 include/vgm/utils/DataLoader.h
 include/vgm/utils/FileLoader.h
 include/vgm/utils/MemoryLoader.h
 include/vgm/utils/OSMutex.h
 include/vgm/utils/OSSignal.h
 include/vgm/utils/OSThread.h
 include/vgm/utils/StrUtils.h
 lib/cmake/libvgm/libvgmConfig.cmake
 lib/cmake/libvgm/libvgmConfigVersion.cmake
 lib/cmake/libvgm/libvgmTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libvgm/libvgmTargets.cmake
-lib/libvgm-audio.a
-lib/libvgm-emu.a
-lib/libvgm-player.a
-lib/libvgm-utils.a
+lib/libvgm-audio.so
+lib/libvgm-emu.so
+lib/libvgm-player.so
+lib/libvgm-utils.so
 libdata/pkgconfig/vgm-audio.pc
 libdata/pkgconfig/vgm-emu.pc
 libdata/pkgconfig/vgm-player.pc
 libdata/pkgconfig/vgm-utils.pc