diff --git a/multimedia/musikcube/Makefile b/multimedia/musikcube/Makefile
index b4f4deeef4b0..5a803f4e78e2 100644
--- a/multimedia/musikcube/Makefile
+++ b/multimedia/musikcube/Makefile
@@ -1,42 +1,41 @@
 PORTNAME=	musikcube
-DISTVERSION=	0.96.5
-PORTREVISION=	1
+DISTVERSION=	0.96.6
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Terminal-based music player, audio engine, metadata indexer, server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libev.so:devel/libev \
 		libfaad.so:audio/faad \
 		libFLAC.so:audio/flac \
 		libmicrohttpd.so:www/libmicrohttpd \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libsndio.so:audio/sndio \
 		libtag.so:audio/taglib \
 		libvorbis.so:audio/libvorbis
 
 USES=		cmake:noninja compiler:c++14-lang pkgconfig ssl
-
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	clangen
-LDFLAGS+=	-lncursesw -lpanelw -ltinfow
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses
+CMAKE_ARGS=	-DNCURSES_DISABLE_LIB_SUFFIXES=false
 .else
 USES+=		ncurses:port
 CFLAGS+=	-I${LOCALBASE}/include/ncurses
+CMAKE_ARGS=	-DNCURSES_DISABLE_LIB_SUFFIXES=true
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/musikcube/distinfo b/multimedia/musikcube/distinfo
index 5b5b37f2ba1d..1e865de42de0 100644
--- a/multimedia/musikcube/distinfo
+++ b/multimedia/musikcube/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611944934
-SHA256 (clangen-musikcube-0.96.5_GH0.tar.gz) = ee00667ea172a557c00de485fbbaa3fde3eb5ec1867c94b5f1705c1b72807490
-SIZE (clangen-musikcube-0.96.5_GH0.tar.gz) = 9474635
+TIMESTAMP = 1618798011
+SHA256 (clangen-musikcube-0.96.6_GH0.tar.gz) = 3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e
+SIZE (clangen-musikcube-0.96.6_GH0.tar.gz) = 9506235
diff --git a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt b/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt
deleted file mode 100644
index 55f73c00b19a..000000000000
--- a/multimedia/musikcube/files/patch-src_musikcube_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/musikcube/CMakeLists.txt.orig	2021-01-24 21:53:38 UTC
-+++ src/musikcube/CMakeLists.txt
-@@ -83,7 +83,7 @@ set_target_properties(musikcube PROPERTIES LINK_FLAGS 
- 
- if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-     find_package(PkgConfig)
--    pkg_check_modules(NCURSES REQUIRED ncursesw panelw)
-+    pkg_check_modules(NCURSES ncurses panel)
-     target_link_libraries(musikcube ${musikcube_LINK_LIBS} ${NCURSES_LIBRARIES} musikcore)
- elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-     if (${LINK_STATICALLY} MATCHES "true")
diff --git a/multimedia/musikcube/pkg-plist b/multimedia/musikcube/pkg-plist
index 7bdf8fa55c94..1b2d9287fc6c 100644
--- a/multimedia/musikcube/pkg-plist
+++ b/multimedia/musikcube/pkg-plist
@@ -1,68 +1,69 @@
 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
 %%DATADIR%%/libmusikcore.so
+%%DATADIR%%/locales/de_DE.json
 %%DATADIR%%/locales/en_US.json
 %%DATADIR%%/locales/fr_FR.json
 %%DATADIR%%/locales/it_IT.json
 %%DATADIR%%/locales/ja_JP.json
 %%DATADIR%%/locales/ru_RU.json
 %%DATADIR%%/locales/zh_CN.json
 %%DATADIR%%/musikcube
 %%DATADIR%%/musikcubed
 %%DATADIR%%/plugins/libffmpegdecoder.so
 %%DATADIR%%/plugins/libgmedecoder.so
 %%DATADIR%%/plugins/libhttpdatastream.so
 %%DATADIR%%/plugins/libnullout.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