diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 67decba429e4..b0f0ec04e1e4 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -1,85 +1,85 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
 
 PORTNAME=	linuxsampler
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.linuxsampler.org/packages/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular MIDI sampler
 
 LIB_DEPENDS=	gig:${PORTSDIR}/audio/libgig
 
 RESTRICTED=	no commercial use
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported"
 
 OPTIONS_DEFINE=	JACK ALSA ARTS DSSI LV2CORE
 OPTIONS_DEFAULT=	JACK
 DSSI_DESC=	Enable DSSI support
 LV2CORE_DESC=	Enable LV2 support
 
 USE_BZIP2=	yes
 USES=	pathfix pkgconfig
 USE_SQLITE=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	HAVE_UNIX98=1
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		linuxsampler.1
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=--disable-jack-driver
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 .else
 CONFIGURE_ARGS+=--disable-alsa-driver
 .endif
 
 .if ${PORT_OPTIONS:MARTS}
 LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
 .else
 CONFIGURE_ARGS+=--disable-arts-driver
 .endif
 
 .if ${PORT_OPTIONS:MDSSI}
 BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
 RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
 PLIST_SUB+=	DSSI=""
 .else
 CONFIGURE_ENV+=	ac_cv_header_dssi_h=no
 PLIST_SUB+=	DSSI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLV2CORE}
 BUILD_DEPENDS+=	lv2core>=0:${PORTSDIR}/audio/lv2core
 RUN_DEPENDS+=	lv2core>=0:${PORTSDIR}/audio/lv2core
 PLIST_SUB+=	LV2CORE=""
 .else
 CONFIGURE_ENV+=	ac_cv_header_lv2_h=no
 PLIST_SUB+=	LV2CORE="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g ; \
 		 s|"lv2core"|"_lv2core_"|' ${WRKSRC}/configure
 
 post-install:
 	@${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me
 
 .include <bsd.port.mk>
diff --git a/audio/linuxsampler/pkg-plist b/audio/linuxsampler/pkg-plist
index 3e3744c4ba47..25b1507760f4 100644
--- a/audio/linuxsampler/pkg-plist
+++ b/audio/linuxsampler/pkg-plist
@@ -1,53 +1,57 @@
 bin/linuxsampler
 include/linuxsampler/EventListeners.h
 include/linuxsampler/Sampler.h
 include/linuxsampler/common/Condition.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/engines/Engine.h
 include/linuxsampler/engines/EngineChannel.h
 include/linuxsampler/engines/FxSend.h
 include/linuxsampler/engines/InstrumentManager.h
 include/linuxsampler/plugins/InstrumentEditor.h
 include/linuxsampler/plugins/InstrumentEditorFactory.h
 %%DSSI%%lib/dssi/linuxsampler.a
 %%DSSI%%lib/dssi/linuxsampler.la
 %%DSSI%%lib/dssi/linuxsampler.so
 lib/linuxsampler/liblinuxsampler.a
 lib/linuxsampler/liblinuxsampler.la
 lib/linuxsampler/liblinuxsampler.so
 lib/linuxsampler/liblinuxsampler.so.3
 lib/linuxsampler/plugins/.keep_me
 %%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.a
 %%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.la
 %%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.so
 %%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
 %%LV2CORE%%lib/lv2/linuxsampler.lv2/manifest.ttl
 libdata/pkgconfig/linuxsampler.pc
 %%LV2CORE%%@dirrm lib/lv2/linuxsampler.lv2
 @dirrm lib/linuxsampler/plugins
 @dirrm lib/linuxsampler
 @dirrm include/linuxsampler/plugins
 @dirrm include/linuxsampler/engines
 @dirrm include/linuxsampler/effects
 @dirrm include/linuxsampler/drivers/midi
 @dirrm include/linuxsampler/drivers/audio
 @dirrm include/linuxsampler/drivers
 @dirrm include/linuxsampler/common
 @dirrm include/linuxsampler
+@cwd /var
+lib/linuxsampler/instruments.db
+@dirrm lib/linuxsampler
+@dirrmtry lib