diff --git a/bin/create-tags b/bin/create-tags
index 61dfe0e..9575063 100755
--- a/bin/create-tags
+++ b/bin/create-tags
@@ -6,5 +6,5 @@
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
       --languages=-HTML,Java \
-      -R --exclude=${INPATH/./\\.} --exclude=binfilter --exclude=solver \
+      -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter --exclude=solver \
       --totals=yes --sort=foldcase *
diff --git a/bin/tinbuild b/bin/tinbuild
index 97a6bbd..549dd09 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -107,7 +107,7 @@ if test "$SEND_MAIL" -eq 1 ; then
 		echo "Owner not set."
 		exit 1
 	fi
-	if test "$OWNER" = "${OWNER/@/_}" ; then
+	if test "$OWNER" = `echo ${OWNER} | sed 's/\@/_/g'` ; then
 		echo "The owner address '$OWNER' does not look like an email address."
 		exit 1
 	fi
