diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile
index cc7220def89a..2662c5777beb 100644
--- a/multimedia/musikcube/Makefile
+++ b/multimedia/musikcube/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	musikcube
 DISTVERSION=	3.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terminal-based music player, audio engine, metadata indexer, server
-WWW=		https://musikcube.com/
+WWW=		https://musikcube.com/ \
+		https://github.com/clangen/musikcube
 
-LICENSE=	GPLv2
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	asio>0:net/asio
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libavcodec.so:multimedia/ffmpeg \
 		libbasu.so:devel/basu \
 		libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libFLAC.so:audio/flac \
+		libgme.so:audio/libgme \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libmp3lame.so:audio/lame \
 		libmpg123.so:audio/mpg123 \
 		libogg.so:audio/libogg \
 		libopenmpt.so:audio/libopenmpt \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libportaudio.so:audio/portaudio \
 		libpulse.so:audio/pulseaudio \
 		libsndio.so:audio/sndio \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 
-USES=		cmake:noninja compiler:c++17-lang ncurses pkgconfig ssl
+USES=		cmake compiler:c++17-lang ncurses pkgconfig ssl
 USES+=		localbase # workaround for https://github.com/clangen/musikcube/issues/600
 USE_LDCONFIG=	yes
+
 CMAKE_ON=	USE_BASU
 CMAKE_ARGS+=	-DNCURSES_DISABLE_LIB_SUFFIXES=false
-CMAKE_ON+=	FREEBSD_USE_BASE_NCURSES
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clangen
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
 		share/musikcube/libmusikcore.so \
 		share/musikcube/musikcube \
 		share/musikcube/musikcubed \
 		share/musikcube/plugins/*.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/musikcube/pkg-plist b/multimedia/musikcube/pkg-plist
index 5d0272150ce4..a3974fab1c08 100644
--- a/multimedia/musikcube/pkg-plist
+++ b/multimedia/musikcube/pkg-plist
@@ -1,78 +1,79 @@
 bin/musikcube
 bin/musikcubed
 include/musikcube/musikcore/sdk/DataBuffer.h
 include/musikcube/musikcore/sdk/Filesystem.h
 include/musikcube/musikcore/sdk/HttpClient.h
 include/musikcube/musikcore/sdk/IAllocator.h
 include/musikcube/musikcore/sdk/IAnalyzer.h
 include/musikcube/musikcore/sdk/IBlockingEncoder.h
 include/musikcube/musikcore/sdk/IBuffer.h
 include/musikcube/musikcore/sdk/IBufferProvider.h
 include/musikcube/musikcore/sdk/IDSP.h
 include/musikcube/musikcore/sdk/IDataStream.h
 include/musikcube/musikcore/sdk/IDataStreamFactory.h
 include/musikcube/musikcore/sdk/IDebug.h
 include/musikcube/musikcore/sdk/IDecoder.h
 include/musikcube/musikcore/sdk/IDecoderFactory.h
 include/musikcube/musikcore/sdk/IDevice.h
 include/musikcube/musikcore/sdk/IEncoder.h
 include/musikcube/musikcore/sdk/IEncoderFactory.h
 include/musikcube/musikcore/sdk/IEnvironment.h
 include/musikcube/musikcore/sdk/IIndexerNotifier.h
 include/musikcube/musikcore/sdk/IIndexerSource.h
 include/musikcube/musikcore/sdk/IIndexerWriter.h
 include/musikcube/musikcore/sdk/IMap.h
 include/musikcube/musikcore/sdk/IMapList.h
 include/musikcube/musikcore/sdk/IMetadataProxy.h
 include/musikcube/musikcore/sdk/IOutput.h
 include/musikcube/musikcore/sdk/IPcmVisualizer.h
 include/musikcube/musikcore/sdk/IPlaybackRemote.h
 include/musikcube/musikcore/sdk/IPlaybackService.h
 include/musikcube/musikcore/sdk/IPlugin.h
 include/musikcube/musikcore/sdk/IPreferences.h
 include/musikcube/musikcore/sdk/IResource.h
 include/musikcube/musikcore/sdk/ISchema.h
 include/musikcube/musikcore/sdk/ISpectrumVisualizer.h
 include/musikcube/musikcore/sdk/IStreamingEncoder.h
 include/musikcube/musikcore/sdk/ITagReader.h
 include/musikcube/musikcore/sdk/ITagStore.h
 include/musikcube/musikcore/sdk/ITrack.h
 include/musikcube/musikcore/sdk/ITrackList.h
 include/musikcube/musikcore/sdk/ITrackListEditor.h
 include/musikcube/musikcore/sdk/IValue.h
 include/musikcube/musikcore/sdk/IValueList.h
 include/musikcube/musikcore/sdk/IVisualizer.h
 include/musikcube/musikcore/sdk/ReplayGain.h
 include/musikcube/musikcore/sdk/String.h
 include/musikcube/musikcore/sdk/constants.h
 include/musikcube/musikcore/sdk/version.h
 %%DATADIR%%/libmusikcore.so
 %%DATADIR%%/locales/cs_CZ.json
 %%DATADIR%%/locales/de_DE.json
 %%DATADIR%%/locales/en_US.json
 %%DATADIR%%/locales/es_ES.json
 %%DATADIR%%/locales/fr_FR.json
 %%DATADIR%%/locales/it_IT.json
 %%DATADIR%%/locales/ja_JP.json
 %%DATADIR%%/locales/ru_RU.json
 %%DATADIR%%/locales/uk_UA.json
 %%DATADIR%%/locales/zh_CN.json
 %%DATADIR%%/musikcube
 %%DATADIR%%/musikcubed
 %%DATADIR%%/plugins/libalsaout.so
 %%DATADIR%%/plugins/libffmpegdecoder.so
+%%DATADIR%%/plugins/libgmedecoder.so
 %%DATADIR%%/plugins/libhttpdatastream.so
 %%DATADIR%%/plugins/libmpris.so
 %%DATADIR%%/plugins/libnullout.so
 %%DATADIR%%/plugins/libopenmptdecoder.so
 %%DATADIR%%/plugins/libpipewireout.so
 %%DATADIR%%/plugins/libportaudioout.so
 %%DATADIR%%/plugins/libpulseout.so
 %%DATADIR%%/plugins/libserver.so
 %%DATADIR%%/plugins/libsndioout.so
 %%DATADIR%%/plugins/libstockencoders.so
 %%DATADIR%%/plugins/libsupereqdsp.so
 %%DATADIR%%/plugins/libtaglibreader.so
 %%DATADIR%%/themes/gruvbox_dark.json
 %%DATADIR%%/themes/solarized_dark.json
 %%DATADIR%%/themes/solarized_light.json