diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 8d37e10394c..49d6607c1a0 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -113,7 +113,7 @@ fill_default_server_options(ServerOptions *options)
 	if (options->print_motd == -1)
 		options->print_motd = 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->strict_modes == -1)
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index e1fbe8e635a..ca64fdf6eff 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -19,7 +19,7 @@ IgnoreRhosts yes
 # Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
 #IgnoreUserKnownHosts yes
 StrictModes yes
-X11Forwarding no
+X11Forwarding yes
 X11DisplayOffset 10
 PrintMotd yes
 KeepAlive yes