diff --git a/openssh-6.6p1-redhat.patch b/openssh-6.6p1-redhat.patch
index 6ebd1e4..b8e4b40 100644
--- a/openssh-6.6p1-redhat.patch
+++ b/openssh-6.6p1-redhat.patch
@@ -2,21 +2,32 @@ diff --git a/ssh_config b/ssh_config
 index 49a4f6c..3f83c40 100644
 --- a/ssh_config
 +++ b/ssh_config
-@@ -46,3 +46,19 @@
+@@ -46,3 +46,7 @@
  #   VisualHostKey no
  #   ProxyCommand ssh -q -W %h:%p gateway.example.com
  #   RekeyLimit 1G 1h
 +#
++# To modify the system-wide ssh configuration, create a file under
++#  /etc/ssh/ssh_config.d/  which will get automatically included below
++Include /etc/ssh/ssh_config.d/*.conf
+diff --git a/ssh_config.redhat b/ssh_config.redhat
+new file mode 100644
+index 0000000..9082a13
+--- /dev/null
++++ b/ssh_config.redhat
+@@ -0,0 +1,17 @@
 +# Uncomment this if you want to use .local domain
 +# Host *.local
 +#   CheckHostIP no
 +
 +Host *
 +	GSSAPIAuthentication yes
++
 +# If this option is set to yes then remote X11 clients will have full access
 +# to the original X11 display. As virtually no X11 client supports the untrusted
 +# mode correctly we set this to yes.
 +	ForwardX11Trusted yes
++
 +# Send locale-related environment variables
 +	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
 +	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
diff --git a/openssh.spec b/openssh.spec
index f16dafb..10db6e6 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -625,6 +625,7 @@ make tests
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh/ssh_config.d
 mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh
 mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -637,6 +638,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/fipscheck
 install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sshd
 install -m644 %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/ssh-keycat
 install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sshd
+install -m644 ssh_config.redhat $RPM_BUILD_ROOT/etc/ssh/ssh_config.d/05-redhat.conf
 install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 %{SOURCE9} $RPM_BUILD_ROOT/%{_unitdir}/sshd@.service
 install -m644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}/sshd.socket
@@ -716,6 +718,8 @@ getent passwd sshd >/dev/null || \
 %attr(0755,root,root) %{_bindir}/scp
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
+%dir %attr(0644,root,root) %{_sysconfdir}/ssh/ssh_config.d/
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config.d/05-redhat.conf
 %attr(0644,root,root) %{_mandir}/man5/ssh_config.5*
 %if ! %{rescue}
 %attr(0755,root,root) %{_bindir}/ssh-agent