diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 7d5d0a5eff33..17255116c30d 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -1,45 +1,40 @@
 # Created by: trasz <trasz@FreeBSD.org
 
 PORTNAME=	qsampler
 DISTVERSIONPREFIX=	qsampler_
-DISTVERSION=	0_6_1
-PORTREVISION=	3
+DISTVERSION=	0_9_4
 CATEGORIES=	audio
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Qt-based front end to LinuxSampler
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgig.so:audio/libgig \
 		liblscp.so:audio/liblscp
 RUN_DEPENDS=	linuxsampler:audio/linuxsampler
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-USES=		autoreconf desktop-file-utils gl gmake pkgconfig \
+USES=		autoreconf desktop-file-utils gl gmake localbase:ldflags pkgconfig \
 		shared-mime-info qmake:no_env qt:5 xorg
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_path_ac_cv_qmake=${QMAKE} \
-		ac_cv_path_ac_moc=${MOC} \
-		ac_cv_path_ac_uic=${UIC} \
-		ac_cv_path_ac_rcc=${RCC} \
-		ac_cv_path_ac_lupdate=${LUPDATE} \
-		ac_cv_path_ac_lrelease=${LRELEASE}
-CONFIGURE_ARGS=	--enable-qt5
 USE_GL=		gl
 USE_QT=		core gui network widgets x11extras \
 		buildtools_build linguisttools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rncbc
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-qt5
+
+CXXFLAGS+=	-I${LOCALBASE}/include/qt5 -fPIC # https://github.com/rncbc/qsampler/issues/18
+LDFLAGS+=	-llscp
+
 post-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o ${PORTNAME}.mak \
 		${QMAKE_ARGS}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qsampler
 
 .include <bsd.port.mk>
diff --git a/audio/qsampler/distinfo b/audio/qsampler/distinfo
index 992d0daea77f..03db424f58ea 100644
--- a/audio/qsampler/distinfo
+++ b/audio/qsampler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577127339
-SHA256 (rncbc-qsampler-qsampler_0_6_1_GH0.tar.gz) = 0cc3e8c0cfc2d5a5862ee88da803e4483c78c121fb8fdb858dd9b1484abe4cfa
-SIZE (rncbc-qsampler-qsampler_0_6_1_GH0.tar.gz) = 248481
+TIMESTAMP = 1625421753
+SHA256 (rncbc-qsampler-qsampler_0_9_4_GH0.tar.gz) = 97320af3dde7eeb1e73cb54acc9a86d8732c570055c3c2433d7e8ee99532877c
+SIZE (rncbc-qsampler-qsampler_0_9_4_GH0.tar.gz) = 251087
diff --git a/audio/qsampler/pkg-plist b/audio/qsampler/pkg-plist
index 2aaf1e236e72..97af0f2ebe8c 100644
--- a/audio/qsampler/pkg-plist
+++ b/audio/qsampler/pkg-plist
@@ -1,13 +1,13 @@
 bin/qsampler
+man/fr/man1/qsampler.1.gz
 man/man1/qsampler.1.gz
-man/man1/qsampler.fr.1.gz
 share/applications/qsampler.desktop
 share/icons/hicolor/32x32/apps/qsampler.png
 share/icons/hicolor/32x32/mimetypes/application-x-qsampler-session.png
 share/icons/hicolor/scalable/apps/qsampler.svg
 share/icons/hicolor/scalable/mimetypes/application-x-qsampler-session.svg
 share/metainfo/qsampler.appdata.xml
 share/mime/packages/qsampler.xml
 %%DATADIR%%/translations/qsampler_cs.qm
 %%DATADIR%%/translations/qsampler_fr.qm
 %%DATADIR%%/translations/qsampler_ru.qm