diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index e5c8f3e7e8..0528320df7 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -9,8 +9,6 @@
 
 # where the GTK stack is installed
 GTKSTACK_ROOT=$HOME/gtk/inst
-# where the Ardour dependencies are installed
-ARDOURSTACK_ROOT=$HOME/a3/inst
 # the waf build tree to use when copying built/generated files
 BUILD_ROOT=../../build
 
@@ -436,11 +434,6 @@ if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
     cp $GTKSTACK_ROOT/lib/suil-0/lib* $Libraries
 fi
 
-# Suil modules (old dir 'build-ardour-stack')
-if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
-    cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Libraries
-fi
-
 # VST scanner app (both LXVST as well as WIN-VST, 2in1)
 # (if build with wine: ardour-vst-scanner is a wrapper
 #  script for ardour-vst-scanner.exe.so, if VST is disabled
@@ -674,14 +667,12 @@ fi
 # install bundled LV2s to <app>/lib/LV2/
 cp -R $BUILD_ROOT/libs/LV2 $APPLIB/
 
-# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
-if test -d $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
-	mkdir -p $APPLIB/LV2/lv2core.lv2
-	cp -R $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
-elif test -d $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
-	mkdir -p $APPLIB/LV2/lv2core.lv2
-	cp -R $GTKSTACK_ROOT/lib/lv2/lv2core.lv2/*.ttl $APPLIB/LV2/lv2core.lv2/
-fi
+# lv2 core, classifications
+for file in $GTKSTACK_ROOT/lib/lv2/*.lv2; do
+	BN=$(basename $file)
+	mkdir -p $APPLIB/LV2/$file
+	cp $GTKSTACK_ROOT/lib/lv2/${file}/*.ttl $APPLIB/LV2/${file}.lv2/
+done
 
 # go through and recursively remove any .svn dirs in the bundle
 for svndir in `find $APPDIR -name .svn -type d`; do
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 786c82731e..f5e88bbcb1 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -5,7 +5,6 @@ set -e
 # script for pulling together a MacOSX app bundle.
 
 GTKSTACK_ROOT=$HOME/gtk/inst
-ARDOURSTACK_ROOT=$HOME/a3/inst
 BUILD_ROOT=../../build
 
 # where harvid and xjadeo binaries are cached
@@ -390,11 +389,6 @@ if test -d $GTKSTACK_ROOT/lib/suil-0/ ; then
 	cp $GTKSTACK_ROOT/lib/suil-0/lib* $Frameworks
 fi
 
-# Suil modules (old dir 'build-ardour-stack')
-if test -d $ARDOURSTACK_ROOT/lib/suil-0/ ; then
-	cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks
-fi
-
 # VST scanner app and wrapper script, if they exist
 if test -d $BUILD_ROOT/libs/fst ; then
 	cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
@@ -457,7 +451,7 @@ while [ true ] ; do
 			strip -u -r -arch all $file &>/dev/null
 		fi
 
-		deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
+		deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
 		# echo -n "."
 		for dep in $deps ; do
 			base=`basename $dep`
@@ -529,12 +523,12 @@ fi
 # install bundled LV2s to <app>/Contents/lib/LV2/
 cp -R $BUILD_ROOT/libs/LV2 $Frameworks/
 
-# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
-if test -d $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
-	cp -R $ARDOURSTACK_ROOT/lib/lv2/lv2core.lv2 $Frameworks/LV2/
-elif test -d $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 ; then
-	cp -R $GTKSTACK_ROOT/lib/lv2/lv2core.lv2 $Frameworks/LV2/
-fi
+# lv2 core, classifications
+for file in $GTKSTACK_ROOT/lib/lv2/*.lv2; do
+	BN=$(basename $file)
+	mkdir -p $APPLIB/LV2/$file
+	cp $GTKSTACK_ROOT/lib/lv2/${file}/*.ttl $APPLIB/LV2/${file}.lv2/
+done
 
 
 # now fix up the executables
@@ -559,7 +553,7 @@ for exe in $executables; do
 	echo "Processing Executable: $exe"
 	EXE=$APPROOT/MacOS/$exe
 	changes=""
-	for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+	for lib in `otool -L $EXE | egrep "($GTKSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
 		base=`basename $lib`
 		changes="$changes -change $lib @executable_path/../lib/$base"
 	done
@@ -585,7 +579,7 @@ for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends $Fram
 		# change all the dependencies
 
 		changes=""
-		for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
+		for lib in `otool -L $dylib | egrep "($GTKSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | awk '{print $1}' | grep -v 'libjack\.'` ; do
 			base=`basename $lib`
 			if echo $lib | grep -s libbase; then
 				changes="$changes -change $lib @executable_path/../$libbase/$base"
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index c35956f7e8..12d7543813 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -170,10 +170,13 @@ cp -r build/libs/vamp-plugins/*ardourvampplugins*.dll $ALIBDIR/vamp/libardourvam
 cp -r build/libs/vamp-pyin/*ardourvamppyin*.dll $ALIBDIR/vamp/libardourvamppyin.dll
 cp $PREFIX/lib/suil-*/*.dll $ALIBDIR/suil/ || true
 
-# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
-if test -d $PREFIX/lib/lv2/lv2core.lv2 ; then
-	cp -R $PREFIX/lib/lv2/lv2core.lv2 $ALIBDIR/LV2/
-fi
+# lv2 core, classifications
+for file in $PREFIX/lib/lv2/*.lv2; do
+	BN=$(basename $file)
+	mkdir -p $ALIBDIR/LV2/$file
+	cp $PREFIX/lib/lv2/${file}/*.ttl $ALIBDIR/LV2/${file}.lv2/
+done
+
 
 mv $ALIBDIR/surfaces/ardourcp*.dll $DESTDIR/bin/