diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index 49efcf727..b93388d76 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -54,7 +54,7 @@ pkgver=6.4.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-aarch64"
-pkgrel=6
+pkgrel=7
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="armhf x86_64 x86"
@@ -440,7 +440,7 @@ _package() {
 		done
 	else
 		# add c89/c99 wrapper scripts
-		cat >"$pkgdir"/usr/bin/c89 <<EOF
+		cat >"$pkgdir"/usr/bin/c89 <<'EOF'
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -452,13 +452,13 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-		cat >"$pkgdir"/usr/bin/c99 <<-EOF
+		cat >"$pkgdir"/usr/bin/c99 <<'EOF'
 #!/bin/sh
 fl="-std=c99"
 for opt; do
 	case "$opt" in
 	-std=c99|-std=iso9899:1999) fl="";;
-	-std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	-std=*) echo "$(basename $0) called with non ISO C99 option $opt" >&2
 		exit 1;;
 	esac
 done
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 58f2a9299..68760de33 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -54,7 +54,7 @@ pkgver=6.4.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-armhf"
-pkgrel=6
+pkgrel=7
 pkgdesc="Stage2 cross-compiler for armhf"
 url="http://gcc.gnu.org"
 arch="aarch64 x86_64 x86"
@@ -440,7 +440,7 @@ _package() {
 		done
 	else
 		# add c89/c99 wrapper scripts
-		cat >"$pkgdir"/usr/bin/c89 <<EOF
+		cat >"$pkgdir"/usr/bin/c89 <<'EOF'
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -452,13 +452,13 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-		cat >"$pkgdir"/usr/bin/c99 <<-EOF
+		cat >"$pkgdir"/usr/bin/c99 <<'EOF'
 #!/bin/sh
 fl="-std=c99"
 for opt; do
 	case "$opt" in
 	-std=c99|-std=iso9899:1999) fl="";;
-	-std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	-std=*) echo "$(basename $0) called with non ISO C99 option $opt" >&2
 		exit 1;;
 	esac
 done
diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD
index 9a90c2ab6..9cf6d78d5 100644
--- a/cross/gcc-x86_64/APKBUILD
+++ b/cross/gcc-x86_64/APKBUILD
@@ -54,7 +54,7 @@ pkgver=6.4.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-x86_64"
-pkgrel=6
+pkgrel=7
 pkgdesc="Stage2 cross-compiler for x86_64"
 url="http://gcc.gnu.org"
 arch="armhf aarch64 x86"
@@ -440,7 +440,7 @@ _package() {
 		done
 	else
 		# add c89/c99 wrapper scripts
-		cat >"$pkgdir"/usr/bin/c89 <<EOF
+		cat >"$pkgdir"/usr/bin/c89 <<'EOF'
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -452,13 +452,13 @@ for opt; do
 done
 exec gcc $fl ${1+"$@"}
 EOF
-		cat >"$pkgdir"/usr/bin/c99 <<-EOF
+		cat >"$pkgdir"/usr/bin/c99 <<'EOF'
 #!/bin/sh
 fl="-std=c99"
 for opt; do
 	case "$opt" in
 	-std=c99|-std=iso9899:1999) fl="";;
-	-std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
+	-std=*) echo "$(basename $0) called with non ISO C99 option $opt" >&2
 		exit 1;;
 	esac
 done