diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index b147e4080b4a..92796a986d2b 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -1,117 +1,106 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 
 PORTNAME=	zynaddsubfx
-DISTVERSION=	3.0.6-rc5
-PORTEPOCH=	1
-PORTREVISION=	3
+DISTVERSION=	3.0.6
+PORTEPOCH=	2
 CATEGORIES=	audio
 
 MAINTAINER=	hselasky@FreeBSD.org
 COMMENT=	Realtime software synthesizer
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 		libmxml.so:textproc/mxml \
 		liblo.so:audio/liblo
 
 USES=		cmake:insource compiler:c++11-lang pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	DISTRHO:DPF:86a621bfd86922a49ce593fec2a618a1e0cc6ef3:d/DPF \
-		fundamental:rtosc:75a58931f633ce77b08ce5ef86d7db58434af3ac:e/rtosc \
+		fundamental:rtosc:2aec26327e0139131c9bd7439c9928370fccf1ce:e/rtosc \
 		zynaddsubfx:instruments:c5c912131b31df5fdf372d2f06a25aaf2375837f:f/instruments
 
 OPTIONS_DEFINE=		BASH OSS JACK GUI PORTAUDIO SNDIO LASH DOCS EXAMPLES
 OPTIONS_DEFAULT=	OSS JACK GUI PORTAUDIO
 OPTIONS_RADIO=		AUDIO
 OPTIONS_RADIO_AUDIO=	ALSAMIDI DSSI
 OPTIONS_SUB=		yes
 
 ALSAMIDI_DESC=	MIDI input through ALSA
 DSSI_DESC=	DSSI Plugin
 
 ALSAMIDI_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSAMIDI_CMAKE_OFF=		-DAlsaEnable:BOOL=OFF
 
 BASH_DESC=			Support for bash auto-completion
 BASH_BUILD_DEPENDS=		bash-completion>=0:shells/bash-completion
 
 DSSI_LIB_DEPENDS=		libdssialsacompat.so:audio/libdssialsacompat
 DSSI_BUILD_DEPENDS=		dssi>0:audio/dssi
 DSSI_RUN_DEPENDS=		dssi>0:audio/dssi
 DSSI_CFLAGS=			-I${LOCALBASE}/include/dssi
 DSSI_CMAKE_OFF=			-DDssiEnable:BOOL=OFF
 
 GUI_LIB_DEPENDS=		libntk.so:x11-toolkits/ntk \
 				libpng.so:graphics/png \
 				libfontconfig.so:x11-fonts/fontconfig
 GUI_CMAKE_ON=			-DGuiModule:STRING=ntk
 GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
 GUI_USE+=			XORG=x11,xext,xfixes,xcursor,xrender,ice,sm,xpm,xinerama,xft
 GUI_USE+=			GL=gl,glu
 GUI_USES=			gl gnome jpeg xorg
 
 OSS_CMAKE_ON=			-DOssEnable:BOOL=ON
 OSS_CMAKE_OFF=			-DOssEnable:BOOL=OFF
 
 LASH_LIB_DEPENDS=		liblash.so:audio/lash
 LASH_CMAKE_OFF=			-DLashEnable:BOOL=OFF
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
 PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=		-DPaEnable:BOOL=OFF
 
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
 SNDIO_CMAKE_OFF=		-DSndioEnable:BOOL=OFF
 
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	AUTHORS.txt NEWS.txt
 
 DOCSRCDIR2=	${WRKSRC}/doc
 DOCSDIR2=	${DOCSDIR}/doc
 DOC_FILES2=	adsynth.txt controller.txt envelope.txt filter.txt intro.txt \
 		lfo.txt mididefaults.txt nrpn.txt saving.txt zynaddsubfx.txt
 
 DOCSRCDIR3=	${WRKSRC}/doc/images
 DOCSDIR3=	${DOCSDIR}/doc/images
 DOC_FILES3=	*.png *.jpg
 
 PORTEXAMPLES=	*
 
 CMAKE_ARGS+=	-DZYN_DATADIR:STRING=${DATADIR}
 CMAKE_ARGS+=	-DZYN_EXAMPLESDIR:STRING=${EXAMPLESDIR}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-CFLAGS+=	-DASM_F2I_YES
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-O3 .* -fomit-frame-pointer|| ; \
-		 /-DASM_F2I_YES/d ; \
-		 /-g #/d' ${WRKSRC}/src/CMakeLists.txt
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/banks \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${DOCSDIR2} \
 		${STAGEDIR}${DOCSDIR3} \
 		${STAGEDIR}${EXAMPLESDIR}
 
 	(cd ${WRKSRC}/instruments/banks && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/banks)
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
 
 .include <bsd.port.post.mk>
diff --git a/audio/zynaddsubfx/distinfo b/audio/zynaddsubfx/distinfo
index e0d4d7f5912a..00f07b68c662 100644
--- a/audio/zynaddsubfx/distinfo
+++ b/audio/zynaddsubfx/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1640116049
-SHA256 (zynaddsubfx-zynaddsubfx-3.0.6-rc5_GH0.tar.gz) = e833052daa1bdf80bbe348cf485aa5bfa2fa7c74194cd8594fa45bd4b8eecaf6
-SIZE (zynaddsubfx-zynaddsubfx-3.0.6-rc5_GH0.tar.gz) = 3039755
+TIMESTAMP = 1642845798
+SHA256 (zynaddsubfx-zynaddsubfx-3.0.6_GH0.tar.gz) = c898838e1ccb5ebb25c885c27cda3c6e5d2027a96f90a270204357147f9276ec
+SIZE (zynaddsubfx-zynaddsubfx-3.0.6_GH0.tar.gz) = 3042648
 SHA256 (DISTRHO-DPF-86a621bfd86922a49ce593fec2a618a1e0cc6ef3_GH0.tar.gz) = 64ca73787c0dfa9b7d914deb3ade1f1851d59c4ae9e5450cfdf206adfcb2b8de
 SIZE (DISTRHO-DPF-86a621bfd86922a49ce593fec2a618a1e0cc6ef3_GH0.tar.gz) = 3320751
-SHA256 (fundamental-rtosc-75a58931f633ce77b08ce5ef86d7db58434af3ac_GH0.tar.gz) = 3cb081b69f2918886eec3e0813d09c1fa0f9b37c191ccb9b5e9a69a5e52575a6
-SIZE (fundamental-rtosc-75a58931f633ce77b08ce5ef86d7db58434af3ac_GH0.tar.gz) = 182436
+SHA256 (fundamental-rtosc-2aec26327e0139131c9bd7439c9928370fccf1ce_GH0.tar.gz) = 23f0fe3d5c631a9e6a0ada2aec02b09a6ceb393c037b59ab0611bf8d243d4305
+SIZE (fundamental-rtosc-2aec26327e0139131c9bd7439c9928370fccf1ce_GH0.tar.gz) = 182438
 SHA256 (zynaddsubfx-instruments-c5c912131b31df5fdf372d2f06a25aaf2375837f_GH0.tar.gz) = 7ac90d70a88f3312bcc3f8efe099ac8df9e265289ff82f6e645768cd058d87c0
 SIZE (zynaddsubfx-instruments-c5c912131b31df5fdf372d2f06a25aaf2375837f_GH0.tar.gz) = 5040870