diff --git a/makeWeb.sh b/makeWeb.sh
index 48c0c34..f50b177 100755
--- a/makeWeb.sh
+++ b/makeWeb.sh
@@ -29,6 +29,11 @@ title=$booke
 instrument=$3
 abc2xml=$dir/abc2xml/abc2xml.py
 
+instrumentSuffix="${1##*-}"
+if [ "$1" != "$instrumentSuffix" ]; then
+    basetunedir="${basetunedir}-${instrumentSuffix}"
+fi
+
 buildno=`cat buildno.txt`
 # Remove trailing % added for Latex purposes.
 buildno=${buildno%%%}
@@ -41,7 +46,6 @@ fi
 if [ -n "$instrument" ]; then
     title="${title} ($instrument)"
     subtitle="${subtitle} ($instrument)"
-    basetunedir="${basetunedir}-${instrument}"
 fi
 
 mkdir -p $bookewebdir
diff --git a/makeWebGraphics.sh b/makeWebGraphics.sh
index 546f86b..c1f1362 100755
--- a/makeWebGraphics.sh
+++ b/makeWebGraphics.sh
@@ -4,8 +4,8 @@
 # They go into web/tunes/<tunename>, or web/tunes-<instrument>/<tunename>.
 #
 
-if [[ $# -lt 1 ]]; then
-    echo "Usage: makeWebGraphics.sh <book dir name> [<instrument name>]"
+if [[ $# -ne 1 ]]; then
+    echo "Usage: makeWebGraphics.sh <book dir name>"
     exit 1
 fi
 
@@ -15,10 +15,10 @@ booke=$dir/$1
 basewebdir=$dir/web
 basetunedir=$basewebdir/tunes
 graphicsdir=$dir/graphics/$1
-instrument=$2
 
-if [ -n "$instrument" ]; then
-    basetunedir="${basetunedir}-${instrument}"
+instrumentSuffix="${1##*-}"
+if [ "$1" != "$instrumentSuffix" ]; then
+    basetunedir="${basetunedir}-${instrumentSuffix}"
 fi
 
 # Now, for each tune, make the main tune and tune first line bitmaps.