diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 12fcfa7d3d..e7245f8e0f 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -19,9 +19,9 @@ makedepends="libedit-devel pam-devel zlib-devel
  $(vopt_if ssl 'libressl-devel')"
 short_desc="The OpenSSH implementation of SSH protocol"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="https://www.openssh.com"
 license="BSD-2-Clause, ISC"
-distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
+homepage="https://www.openssh.com"
+distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
 checksum=6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
@@ -30,9 +30,11 @@ make_dirs="/var/chroot/ssh 0755 root root"
 build_options="ldns ssl gssapi"
 build_options_default="ldns ssl"
 
+CFLAGS+=" -Wno-format-truncation -Wno-stringop-truncation"
+
 case $XBPS_TARGET_MACHINE in
 	i686-musl)
-		CFLAGS="-fno-stack-protector"
+		CFLAGS+=" -fno-stack-protector"
 		configure_args+=" --disable-wtmp --disable-utmp"
 		;;
 	*-musl)
@@ -40,10 +42,6 @@ case $XBPS_TARGET_MACHINE in
 		;;
 esac
 
-if [ "$XBPS_GCC_VERSION_MAJOR" -ge 7 ]; then
-	CFLAGS+=" -Wno-format-truncation -Wno-stringop-truncation"
-fi
-
 pre_configure() {
 	autoreconf -fi
 }