diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index cb9263d65f..50fb408fe4 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -487,7 +487,7 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do
 done
 
 # Templates
-for f in templates/* ; do 
+for f in $BUILD_ROOT/../templates/* ; do 
     if [ -d "$f" ] ; then
 	echo Template: $f ; cp -r "$f" $Templates ; 
     fi
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index d3d07c146c..22fe7819ae 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -305,22 +305,23 @@ cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces
 # hack ... move libardour_cp back into Frameworks
 mv $Surfaces/libardourcp*.dylib $Frameworks
 
-# Export formats
+# Panners
 cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners
-(cd ../../export && 
-    for f in *.preset *.format ; do 
-	echo ExportFormat: $f 
-        cp "$f" $ExportFormats ; 
-done)
+
+
+# Export Formats/Presets
+for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do 
+    echo ExportFormat: $f 
+    cp "$f" $ExportFormats ; 
+done
 
 # Session and Route templates
-(cd $BUILD_ROOT/../templates && \
-    for f in * ; do 
-	if [ -d "$f" ] ; then
-	    echo Template: $f 
-            cp -r "$f" $Templates ; 
-	fi
-done)
+for f in $BUILD_ROOT/../templates/* ; do 
+    if [ -d "$f" ] ; then
+	echo Template: $f 
+        cp -r "$f" $Templates ; 
+    fi
+done
 
 # MidiMaps
 # got to be careful with names here