diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in
index 6f195697b0..4ba1a48945 100644
--- a/tools/linux_packaging/ardour.sh.in
+++ b/tools/linux_packaging/ardour.sh.in
@@ -34,7 +34,7 @@ export LD_LIBRARY_PATH=$INSTALL_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 sed "s?@ROOTDIR@/modules?$LIB_DIR/modules?" < $ETC_DIR/pango.modules.in > $USER_ARDOUR_DIR/pango.modules
 sed "s?@ROOTDIR@/loaders?$LIB_DIR/loaders?" < $ETC_DIR/gdk-pixbuf.loaders.in > $USER_ARDOUR_DIR/gdk-pixbuf.loaders
 
-exec $INSTALL_DIR/bin/ardour-%VER% "$@"
+exec $INSTALL_DIR/bin/ardour-3.0 "$@"
 
 
 
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 0ffd1024c8..552c276419 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -400,10 +400,13 @@ if test x$WITH_LADSPA != x ; then
 	fi
 fi
 
-# XXX STILL NEED TO DO PANNERS FOR TRUNK
-cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces
+# Control Surfaces
+cp $BUILD_ROOT/libs/surfaces/*/libardour*.so* $Surfaces
 # hack ... move libardour_cp back into Libraries
-mv $Surfaces/libardour_cp.so* $Libraries
+mv $Surfaces/libardourcp.so* $Libraries
+
+# Panners
+cp $BUILD_ROOT/libs/panners/*/lib*.so* $Panners
 
 # VAMP plugins that we use
 cp $BUILD_ROOT/libs/vamp-plugins/libardourvampplugins.so* $Libraries