Index: security/openssh-portable/files/patch-servconf.c
===================================================================
--- security/openssh-portable/files/patch-servconf.c
+++ security/openssh-portable/files/patch-servconf.c
@@ -8,15 +8,7 @@
 
 --- servconf.c.orig	2024-07-01 13:30:30.284417000 -0700
 +++ servconf.c	2024-07-01 13:31:20.040132000 -0700
-@@ -46,6 +46,7 @@
- # include "openbsd-compat/glob.h"
- #endif
- 
-+#include "version.h"
- #include "openbsd-compat/sys-queue.h"
- #include "xmalloc.h"
- #include "ssh.h"
-@@ -295,7 +296,11 @@ fill_default_server_options(ServerOptions *options)
+@@ -298,7 +298,11 @@ fill_default_server_options(ServerOptions *options)
  
  	/* Portable-specific options */
  	if (options->use_pam == -1)
@@ -29,16 +21,7 @@
  	if (options->pam_service_name == NULL)
  		options->pam_service_name = xstrdup(SSHD_PAM_SERVICE);
  
-@@ -339,7 +344,7 @@ fill_default_server_options(ServerOptions *options)
- 	if (options->print_lastlog == -1)
- 		options->print_lastlog = 1;
- 	if (options->x11_forwarding == -1)
--		options->x11_forwarding = 0;
-+		options->x11_forwarding = 1;
- 	if (options->x11_display_offset == -1)
- 		options->x11_display_offset = 10;
- 	if (options->x11_use_localhost == -1)
-@@ -381,7 +386,11 @@ fill_default_server_options(ServerOptions *options)
+@@ -380,7 +384,11 @@ fill_default_server_options(ServerOptions *options)
  	if (options->gss_strict_acceptor == -1)
  		options->gss_strict_acceptor = 1;
  	if (options->password_authentication == -1)