diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index cd2586738fa..14ba71c28ad 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=9.6p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -31,6 +31,10 @@ make_dirs="
  /var/chroot/ssh 0755 root root
  /etc/ssh/sshd_config.d 0755 root root"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libxcrypt-devel"
+fi
+
 # Package build options
 build_options="fido2 gssapi ldns ssl"
 build_options_default="fido2 gssapi ldns ssl"
@@ -44,7 +48,7 @@ if [ "$build_option_ldns" -a -z "$build_option_ssl" ]; then
 	broken="option 'ldns' requires option 'ssl'"
 fi
 
-CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-deprecated-declarations"
+CFLAGS="-Wno-format-truncation -Wno-stringop-truncation -Wno-maybe-uninitialized -Wno-deprecated-declarations -Wno-error=use-after-free"
 
 case $XBPS_TARGET_MACHINE in
 	i686-musl)