diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index b18e2cedd815..8430b0efc6ac 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -1,52 +1,60 @@
 PORTNAME=	linuxsampler
-DISTVERSION=	2.3.1
+DISTVERSION=	2.4.0
 CATEGORIES=	audio
 MASTER_SITES=	https://download.linuxsampler.org/packages/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Modular MIDI sampler
 WWW=		https://www.linuxsampler.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	not yet ported to this architecture
 
-BUILD_DEPENDS=	lv2>0:audio/lv2
+BUILD_DEPENDS=	lv2>0:audio/lv2 \
+		p5-XML-Parser>0:textproc/p5-XML-Parser
 LIB_DEPENDS=	libgig.so:audio/libgig \
 		libsndfile.so:audio/libsndfile \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		bison:wrapper compiler:c++14-lang gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2
+USES=		bison compiler:c++14-lang gmake libtool localbase pathfix perl5 \
+		pkgconfig sqlite:3 tar:bzip2 shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/linuxsampler
+USE_PERL5=	build
+
+SHEBANG_FILES=	scripts/generate_lscp_shell_reference.pl \
+		scripts/update_lscp_grammar.pl
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	HAVE_UNIX98=1
 CONFIGURE_ARGS=	--disable-arts-driver
 
+MAKE_JOBS_UNSAFE=	yes # https://bugs.linuxsampler.org/cgi-bin/show_bug.cgi?id=322
+
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		JACK ALSA
 OPTIONS_DEFAULT=	JACK
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa-driver
 ALSA_BROKEN=		error: unknown type name 'snd_pcm_t'
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack-driver
 
 CONFLICTS_BUILD=	dssi # DSSI is a no-longer-maintained interface to obsolete LADSPA plugins - no need to pull DSSI and LADSPA into dependencies
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g ; \
 		 s|"lv2core"|"_lv2core_"|' ${WRKSRC}/configure
 
 post-install:
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/linuxsampler/plugins/.keep_me
 
 .include <bsd.port.mk>
diff --git a/audio/linuxsampler/distinfo b/audio/linuxsampler/distinfo
index f68bb558a354..628d8a2c9fc7 100644
--- a/audio/linuxsampler/distinfo
+++ b/audio/linuxsampler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712548983
-SHA256 (linuxsampler-2.3.1.tar.bz2) = 4fbaae93937924188fa88ce241dd2f682afcb4b0dbc12ea8b73e9e818d353931
-SIZE (linuxsampler-2.3.1.tar.bz2) = 1267554
+TIMESTAMP = 1749022482
+SHA256 (linuxsampler-2.4.0.tar.bz2) = 3f821aad9ccd278354c72dba88b6575f0c4085699a6801b454a8066b2b9640f5
+SIZE (linuxsampler-2.4.0.tar.bz2) = 1151228
diff --git a/audio/linuxsampler/pkg-plist b/audio/linuxsampler/pkg-plist
index 196a4d0ff2a9..b69ae652d17f 100644
--- a/audio/linuxsampler/pkg-plist
+++ b/audio/linuxsampler/pkg-plist
@@ -1,53 +1,52 @@
 bin/linuxsampler
 bin/ls_instr_script
 bin/lscp
 include/linuxsampler/EventListeners.h
 include/linuxsampler/Sampler.h
 include/linuxsampler/common/Condition.h
 include/linuxsampler/common/ConstCapacityArray.h
 include/linuxsampler/common/Exception.h
 include/linuxsampler/common/Mutex.h
 include/linuxsampler/common/SynchronizedConfig.h
 include/linuxsampler/common/Thread.h
 include/linuxsampler/common/global.h
-include/linuxsampler/common/lsatomic.h
 include/linuxsampler/common/optional.h
 include/linuxsampler/drivers/Device.h
 include/linuxsampler/drivers/DeviceParameter.h
 include/linuxsampler/drivers/audio/AudioChannel.h
 include/linuxsampler/drivers/audio/AudioOutputDevice.h
 include/linuxsampler/drivers/midi/MidiInputDevice.h
 include/linuxsampler/drivers/midi/MidiInputPort.h
 include/linuxsampler/drivers/midi/MidiInstrumentMapper.h
 include/linuxsampler/drivers/midi/VirtualMidiDevice.h
 include/linuxsampler/drivers/midi/midi.h
 include/linuxsampler/effects/Effect.h
 include/linuxsampler/effects/EffectChain.h
 include/linuxsampler/effects/EffectControl.h
 include/linuxsampler/effects/EffectFactory.h
 include/linuxsampler/effects/EffectInfo.h
 include/linuxsampler/engines/Engine.h
 include/linuxsampler/engines/EngineChannel.h
 include/linuxsampler/engines/FxSend.h
 include/linuxsampler/engines/InstrumentManager.h
 include/linuxsampler/engines/LFO.h
 include/linuxsampler/plugins/InstrumentEditor.h
 include/linuxsampler/plugins/InstrumentEditorFactory.h
 include/linuxsampler/scriptvm/ScriptVM.h
 include/linuxsampler/scriptvm/ScriptVMFactory.h
 include/linuxsampler/scriptvm/common.h
 lib/linuxsampler/liblinuxsampler.a
 lib/linuxsampler/liblinuxsampler.so
-lib/linuxsampler/liblinuxsampler.so.7
-lib/linuxsampler/liblinuxsampler.so.7.0.0
+lib/linuxsampler/liblinuxsampler.so.8
+lib/linuxsampler/liblinuxsampler.so.8.0.0
 lib/linuxsampler/plugins/.keep_me
 lib/lv2/linuxsampler.lv2/linuxsampler.a
 lib/lv2/linuxsampler.lv2/linuxsampler.so
 lib/lv2/linuxsampler.lv2/linuxsampler.ttl
 lib/lv2/linuxsampler.lv2/manifest.ttl
 libdata/pkgconfig/linuxsampler.pc
 share/man/man1/linuxsampler.1.gz
 share/man/man1/lscp.1.gz
 /var/lib/linuxsampler/instruments.db
 @dir /var/lib/linuxsampler
 @dir /var/lib