diff --git a/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch b/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch
new file mode 120000
index 00000000000..37a7489360f
--- /dev/null
+++ b/srcpkgs/cross-i686-linux-musl/files/libssp-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch b/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch
deleted file mode 120000
index 730486bacb5..00000000000
--- a/srcpkgs/cross-i686-linux-musl/files/no-stack_chk_fail_local.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/no-stack_chk_fail_local.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index dd076beb675..89e36cc17dc 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,9 +12,9 @@ _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
 version=0.33
-revision=1
+revision=2
 short_desc="Cross toolchain for i686 target (musl)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
@@ -89,9 +89,9 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
 	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
+	_apply_patch -p1 ${FILESDIR}/libssp-musl.patch
 	_apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch
 	_apply_patch -p0 ${FILESDIR}/gccgo-musl.patch
 
@@ -100,9 +100,9 @@ _gcc_bootstrap() {
 	[ ! -d ../gcc-bootstrap ] && mkdir ../gcc-bootstrap
 	cd ../gcc-bootstrap
 
-	_args=--prefix=/usr \
-	_args+=" --target=${_triplet}"
+	_args="--target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
+	_args+=" --prefix=/usr"
 	_args+=" --enable-languages=c"
 	_args+=" --with-newlib"
 	_args+=" --disable-nls"
@@ -192,6 +192,7 @@ _gcc_build() {
 	_args="--target=${_triplet}"
 	_args+=" --with-sysroot=${_sysroot}"
 	_args+=" --prefix=/usr"
+	_args+=" --libexecdir=/usr/lib"
 	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --enable-lto"
 	_args+=" --enable-default-pie"
@@ -200,6 +201,7 @@ _gcc_build() {
 	_args+=" --disable-multilib"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
+	_args+=" --enable-libssp"
 	_args+=" --enable-libada"
 	_args+=" --enable-libquadmath"
 	_args+=" --enable-shared"