diff --git a/autogen.sh b/autogen.sh
index 385f15625..f63e5d7d8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,31 +1,28 @@
 #!/bin/sh
-srcdir=`dirname $0`
+srcdir=$(dirname "$0")
 test -z "$srcdir" && srcdir=.
 
-ORIGDIR=`pwd`
-cd "$srcdir"
+ORIGDIR=$(pwd)
+cd "$srcdir" || exit 1
 PROJECT=Transmission
 
 GETTEXTIZE="glib-gettextize"
 $GETTEXTIZE --version < /dev/null > /dev/null 2>&1
 if test $? -ne 0; then
-    GETTEXTIZE=""
+  GETTEXTIZE=""
 fi
 
 LIBTOOLIZE=libtoolize
-if libtoolize --help >/dev/null 2>&1
-then
+if libtoolize --help > /dev/null 2>&1; then
   :
-elif glibtoolize --help >/dev/null 2>&1
-then
+elif glibtoolize --help > /dev/null 2>&1; then
   LIBTOOLIZE=glibtoolize
 fi
 export LIBTOOLIZE
 
 ./update-version-h.sh
 
-autoreconf -fi || exit 1;
-
+autoreconf -fi || exit 1
 
 if test "$GETTEXTIZE"; then
   echo "Creating aclocal.m4 ..."
@@ -41,10 +38,9 @@ fi
 cd "$ORIGDIR" || exit $?
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
-	echo Running $srcdir/configure "$@"
-        $srcdir/configure "$@"
+  echo Running $srcdir/configure "$@"
+  $srcdir/configure "$@"
 
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
+  echo
+  echo "Now type 'make' to compile $PROJECT."
 fi
-
diff --git a/daemon/my-valgrind.sh b/daemon/my-valgrind.sh
index 7db09f934..52c27f4aa 100755
--- a/daemon/my-valgrind.sh
+++ b/daemon/my-valgrind.sh
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
diff --git a/extras/send-email-when-torrent-done.sh b/extras/send-email-when-torrent-done.sh
index ff4416486..79d6d8fa2 100755
--- a/extras/send-email-when-torrent-done.sh
+++ b/extras/send-email-when-torrent-done.sh
@@ -47,7 +47,7 @@ SMTP_SERVER=your.smtp.server
 
 SUBJECT="Torrent Done!"
 FROM_ADDR="transmission@localhost.localdomain"
-TMPFILE=`mktemp -t transmission.XXXXXXXXXX`
-echo "Transmission finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" >$TMPFILE
-$NAIL -v -S from="$FROM_ADDR" -S smtp -s "$SUBJECT" -S smtp=$SMTP_SERVER "$TO_ADDR" < $TMPFILE
-rm $TMPFILE
+TMPFILE=$(mktemp -t transmission.XXXXXXXXXX)
+echo "Transmission finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" > "$TMPFILE"
+$NAIL -v -S from="$FROM_ADDR" -S smtp -s "$SUBJECT" -S smtp=$SMTP_SERVER "$TO_ADDR" < "$TMPFILE"
+rm "$TMPFILE"
diff --git a/gtk/my-valgrind.sh b/gtk/my-valgrind.sh
index 87d960b8e..76683ae5b 100755
--- a/gtk/my-valgrind.sh
+++ b/gtk/my-valgrind.sh
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
diff --git a/libtransmission/fail.sh b/libtransmission/fail.sh
index 22a6171ec..d0beda970 100755
--- a/libtransmission/fail.sh
+++ b/libtransmission/fail.sh
@@ -1,7 +1,8 @@
+#!/bin/sh
 err=0
 count=0
 while [ $err -eq 0 ]; do
-  count=$((count+1))
+  count=$((count + 1))
   echo starting run number $count
   make check
   err=$?
diff --git a/qt/my-valgrind.sh b/qt/my-valgrind.sh
index c3e14cd64..79803ee41 100755
--- a/qt/my-valgrind.sh
+++ b/qt/my-valgrind.sh
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
 #valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
 #valgrind --tool=massif --threshold=0.2 ./transmission-qt 2>&1 | tee runlog
 valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=16 --log-file=x-valgrind --show-reachable=no ./transmission-qt 2>&1 | tee runlog
diff --git a/update-version-h.sh b/update-version-h.sh
index b1e326b4f..386e4bbd9 100755
--- a/update-version-h.sh
+++ b/update-version-h.sh
@@ -2,47 +2,44 @@
 
 # Generate files to be included: only overwrite them if changed so make
 # won't rebuild everything unless necessary
-replace_if_differs ()
-{
-    if cmp $1 $2 > /dev/null 2>&1; then
-      rm -f $1
-    else
-      mv -f $1 $2
-    fi
+replace_if_differs() {
+  if cmp "$1" "$2" > /dev/null 2>&1; then
+    rm -f "$1"
+  else
+    mv -f "$1" "$2"
+  fi
 }
 
 echo "creating libtransmission/version.h"
 
-user_agent_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep user_agent_prefix  | cut -d , -f 6`
+user_agent_prefix=$(grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep user_agent_prefix | cut -d , -f 6)
 
-peer_id_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_prefix  | cut -d , -f 6`
+peer_id_prefix=$(grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_prefix | cut -d , -f 6)
 
-major_version=`echo ${user_agent_prefix} | awk -F . '{print $1}'`
-minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'`
+major_version=$(echo "${user_agent_prefix}" | awk -F . '{print $1}')
+minor_version=$(echo "${user_agent_prefix}" | awk -F . '{print $2 + 0}')
 
 vcs_revision=
 vcs_revision_file=REVISION
 
-if [ -n "$JENKINS_URL" -a -n "$GIT_COMMIT" ]; then
-    vcs_revision=$GIT_COMMIT
-elif [ -n "$TEAMCITY_PROJECT_NAME" -a -n "$BUILD_VCS_NUMBER" ]; then
-    vcs_revision=$BUILD_VCS_NUMBER
-elif [ -d ".git" ] && type git >/dev/null 2>&1; then
-    vcs_revision=`git rev-list --max-count=1 HEAD`
+if [ -n "$JENKINS_URL" ] && [ -n "$GIT_COMMIT" ]; then
+  vcs_revision=$GIT_COMMIT
+elif [ -n "$TEAMCITY_PROJECT_NAME" ] && [ -n "$BUILD_VCS_NUMBER" ]; then
+  vcs_revision=$BUILD_VCS_NUMBER
+elif [ -d ".git" ] && type git > /dev/null 2>&1; then
+  vcs_revision=$(git rev-list --max-count=1 HEAD)
 elif [ -f "$vcs_revision_file" ]; then
-    vcs_revision=`cat "$vcs_revision_file"`
+  vcs_revision=$(cat "$vcs_revision_file")
 fi
 
-vcs_revision=`echo $vcs_revision`
-
 if [ -n "$vcs_revision" ]; then
-    [ -f "$vcs_revision_file" ] && [ "`cat "$vcs_revision_file"`" = "$vcs_revision" ] || echo "$vcs_revision" > "$vcs_revision_file"
+  [ -f "$vcs_revision_file" ] && [ "$(cat "$vcs_revision_file")" = "$vcs_revision" ] || echo "$vcs_revision" > "$vcs_revision_file"
 else
-    vcs_revision=0
-    rm -f "$vcs_revision_file"
+  vcs_revision=0
+  rm -f "$vcs_revision_file"
 fi
 
-vcs_revision=`echo $vcs_revision | head -c10`
+vcs_revision=$(echo $vcs_revision | head -c10)
 
 cat > libtransmission/version.h.new << EOF
 #pragma once
@@ -61,9 +58,9 @@ EOF
 
 # Add a release definition
 case "${peer_id_prefix}" in
-    *X-) echo '#define TR_BETA_RELEASE           1' ;;
-    *Z-) echo '#define TR_NIGHTLY_RELEASE        1' ;;
-    *)   echo '#define TR_STABLE_RELEASE         1' ;;
+  *X-) echo '#define TR_BETA_RELEASE           1' ;;
+  *Z-) echo '#define TR_NIGHTLY_RELEASE        1' ;;
+  *)   echo '#define TR_STABLE_RELEASE         1' ;;
 esac >> "libtransmission/version.h.new"
 
 replace_if_differs libtransmission/version.h.new libtransmission/version.h