diff --git a/make.sh b/make.sh
index 8a41493..7d11652 100755
--- a/make.sh
+++ b/make.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # libiso8601/make.sh
 #
-#  (c)2006-2007, Laurence Withers, <l@lwithers.me.uk>.
+#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv3. See file COPYING or
 #  http://www.gnu.org/copyleft/gpl.html for details.
 #
@@ -15,19 +15,19 @@ then
     echo "Configuration file not found???"
     exit 1
 fi
-source "config" # don't fail on error, since last command in config might return false
+source "./config" # don't fail on error, since last command in config might return false
 
 
 
 # Get version information
-source version || exit 1
+source "./version" || exit 1
 VERSION="${VERMAJOR}.${VERMINOR}.${VERMICRO}"
 
 
 
 # Get standard functions
 [ -z "${VERBOSE}" ] && VERBOSE="0"
-source scripts/functions.sh || exit 1
+source "./scripts/functions.sh" || exit 1
 
 
 # List of directories which will be emptied by clean.
diff --git a/run-test.sh b/run-test.sh
index f563592..cb337f2 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 # libiso8601/test.sh
 #
-#  (c)2007, Laurence Withers, <l@lwithers.me.uk>.
+#  (c)2009, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv3. See file COPYING or
 #  http://www.gnu.org/copyleft/gpl.html for details.
 #
@@ -33,10 +33,10 @@ print_tests() {
     echo "---------------------------------------------------------------------"
     for EXE in obj/tests/*
     do
-        [ -x ${EXE} ] || continue
-        NAME=$(echo ${EXE} | sed 's,obj/tests/,,')
+        [ -x "${EXE}" ] || continue
+        NAME="$(echo "${EXE}" | sed 's,obj/tests/,,')"
         echo -ne "${NAME}\t"
-        LD_LIBRARY_PATH="obj" ${EXE} --print-summary
+        LD_LIBRARY_PATH="obj" "${EXE}" --print-summary
     done
 }
 
diff --git a/src/tests/build.tests b/src/tests/build.tests
index a8ca886..2a31b3b 100644
--- a/src/tests/build.tests
+++ b/src/tests/build.tests
@@ -14,7 +14,7 @@ then
 
     for SRC in src/tests/*.c
     do
-        TEST="obj/tests/$(basename ${SRC} | sed -e 's,.c$,,')"
+        TEST="obj/tests/$(basename "${SRC}" ".c")"
         MODIFIED=0
         for file in ${LIBS} ${SRC} src/tests/build.tests
         do