diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 105af9adbd5..e22628f73fd 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -30,6 +30,7 @@ force_debug_pkgs=yes
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl"
 fi
+makedepends="kernel-libc-headers"
 
 do_configure() {
 	mkdir build
@@ -65,6 +66,9 @@ do_configure() {
 		configure_args+=" --with-headers=${XBPS_MASTERDIR}/usr/include"
 	fi
 
+	# Disable SSP
+	export CFLAGS="${CFLAGS/-fstack-protector-strong/}"
+
 	SHELL=/bin/bash ../configure ${configure_args} \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--libdir=${_libdir} --libexecdir=${_libdir} \