diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC
index febdce06e0..411d3f5a82 100755
--- a/build/script/makedepend.SunCC
+++ b/build/script/makedepend.SunCC
@@ -19,4 +19,4 @@ shift
 dir4=$1
 shift
 
-CC -xM1 $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
+CC -xM1 "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC
index b38de6e62e..21be30fae6 100755
--- a/build/script/makedepend.aCC
+++ b/build/script/makedepend.aCC
@@ -19,7 +19,7 @@ shift
 dir4=$1
 shift
 
-tmpfile=`basename $target`
-aCC -E +maked $@ $source >/dev/null
-sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target
-rm $tmpfile
+tmpfile=$(basename $target)
+aCC -E +maked "$@" "$source" >/dev/null
+sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <"$tmpfile" >"$target"
+rm "$tmpfile"
diff --git a/build/script/makedepend.clang b/build/script/makedepend.clang
index fa08cd74b1..2a09957907 100755
--- a/build/script/makedepend.clang
+++ b/build/script/makedepend.clang
@@ -26,4 +26,4 @@ else
 	CLANG=clang++
 fi
 
-$CLANG -MM $@ $source | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >$target
+$CLANG -MM "$@" "$source" | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >"$target"
diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx
index 700f90c020..25a2c4f797 100755
--- a/build/script/makedepend.cxx
+++ b/build/script/makedepend.cxx
@@ -19,4 +19,4 @@ shift
 dir4=$1
 shift
 
-cxx -M $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
+cxx -M "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc
index 0ebdeae382..41daa24b4a 100755
--- a/build/script/makedepend.gcc
+++ b/build/script/makedepend.gcc
@@ -19,4 +19,4 @@ shift
 dir4=$1
 shift
 
-$CC -MM $@ $source | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >$target
+$CC -MM "$@" "$source" | sed "s#\(.*\.o\):#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1:#" >"$target"
diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc
index 38c3a5081f..b5d50a6265 100755
--- a/build/script/makedepend.qcc
+++ b/build/script/makedepend.qcc
@@ -18,4 +18,4 @@ shift
 dir4=$1
 shift
 
-$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
+$CC -E -Wp,-MM "$@" "$source" | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
diff --git a/build/script/makedepend.xlC b/build/script/makedepend.xlC
index c880398af5..ead6caaec7 100755
--- a/build/script/makedepend.xlC
+++ b/build/script/makedepend.xlC
@@ -20,12 +20,11 @@ shift
 dir4=$1
 shift
 
-cwd=`pwd`
+cwd=$(pwd)
 
-cd `dirname $target`
-$CXX -qmakedep -E -w $@ $cwd/$source >/dev/null
-
-ufile=`basename $source`
-ufile=`echo $ufile | sed "s#\.cpp#\.u#"`
-cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target
+cd "$(dirname "$target")" || exit
+$CXX -qmakedep -E -w "$@" "$cwd"/"$source" >/dev/null
 
+ufile=$(basename "$source")
+ufile=$(echo "$ufile" | sed "s#\.cpp#\.u#")
+sort "$ufile" | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >"$target"
diff --git a/build/script/makeldpath b/build/script/makeldpath
index 5e46d2874a..6ec224123d 100755
--- a/build/script/makeldpath
+++ b/build/script/makeldpath
@@ -10,16 +10,16 @@ if [ "$POCO_BASE" == "" ] ; then
 	exit 1
 fi
 
-projectList=`cat ${POCO_BASE}/components`
+projectList=$(cat "${POCO_BASE}"/components)
 
-OSNAME=`uname`
-OSARCH=`uname -m | tr " /" "_-"`
+OSNAME=$(uname)
+OSARCH=$(uname -m | tr " /" "_-")
 
 for proj in $projectList ;
 do
 	path=${POCO_BASE}/${proj}/lib/${OSNAME}/${OSARCH}
-	echo $path
-	if [ -d $path ] ; then
-		echo -n ":"$path
+	echo "$path"
+	if [ -d "$path" ] ; then
+		printf ":%s" "$path"
 	fi
 done
diff --git a/build/script/projname b/build/script/projname
index 783253ae76..31e01b6571 100755
--- a/build/script/projname
+++ b/build/script/projname
@@ -10,8 +10,8 @@
 #
 
 PROJECT_BASE=$1
-cdir=`sh -c pwd`
-cd $PROJECT_BASE
-projbase=`sh -c pwd`
-cd "$cdir"
+cdir=$(sh -c pwd)
+cd "$PROJECT_BASE" || exit
+projbase=$(sh -c pwd)
+cd "$cdir" || exit
 sh -c pwd | sed "s:^$projbase::" | sed "s:^/::"
diff --git a/build/script/runtests.sh b/build/script/runtests.sh
index 61b67ea761..fac82db427 100755
--- a/build/script/runtests.sh
+++ b/build/script/runtests.sh
@@ -86,10 +86,10 @@ do
 				echo "****************************************"
 				echo ""
 
-				runs=`expr $runs + 1`
+				runs=$((runs + 1))
 				sh -c "cd $POCO_BUILD/$comp/testsuite/$BINDIR && PATH=.:$PATH && LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH $TESTRUNNER $IGNORE $TESTRUNNERARGS"
 				if [ $? -ne 0 ] ; then
-					failures=`expr $failures + 1`
+					failures=$(("failures" + 1))
 					failedTests="$failedTests $comp"
 					status=1
 				fi
diff --git a/ci/runtests.sh b/ci/runtests.sh
index e29454feff..f98efec977 100755
--- a/ci/runtests.sh
+++ b/ci/runtests.sh
@@ -1,10 +1,13 @@
+#!/bin/sh
+
 set -ev
-osname=`uname`
-osarch=`uname -m`
-export POCO_BASE=`pwd`
-export PATH=$PATH:.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:.:$POCO_BASE/lib/$osname/$osarch
+osname=$(uname)
+osarch=$(uname -m)
+POCO_BASE=$(pwd)
+export POCO_BASE
+export PATH="$PATH":.
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":.:"$POCO_BASE"/lib/"$osname"/"$osarch"
+export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH":.:"$POCO_BASE"/lib/"$osname"/"$osarch"
 if [ "TSAN" = "$1" ]
   then
     export TSAN_OPTIONS="suppressions=$POCO_BASE/tsan.suppress,second_deadlock_stack=1"
diff --git a/cppignore.lnx b/cppignore.lnx
index 2c23765261..49a0a71f4b 100644
--- a/cppignore.lnx
+++ b/cppignore.lnx
@@ -7,6 +7,7 @@ CppUnit::TestCaller<FileChannelTest>.testPurgeAge
 CppUnit::TestCaller<FileTest>.testFileAttributes2
 CppUnit::TestCaller<PathTest>.testExpand
 CppUnit::TestCaller<PathTest>.testExpandVariableFromPath
+CppUnit::TestCaller<SyslogTest>.testOldBSD
 CppUnit::TestCaller<ClockTest>.testClock
 CppUnit::TestCaller<TimerTest>.testScheduleAtFixedRate
 CppUnit::TestCaller<TimerTest>.testScheduleInterval
diff --git a/cppignore.win b/cppignore.win
index ecfca7e591..b038cee010 100644
--- a/cppignore.win
+++ b/cppignore.win
@@ -20,3 +20,4 @@ class CppUnit::TestCaller<class WinServiceTest>.testServiceReturnsTrueIfStopped
 class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom
 class CppUnit::TestCaller<class ICMPSocketTest>.testMTU
 class CppUnit::TestCaller<class HTTPSClientSessionTest>.testCachedSession
+class CppUnit::TestCaller<class PollSetTest>.testPollClosedServer