--- a/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Wed Jun 03 07:21:46 2015 -0700
+++ b/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Wed Jun 03 10:42:33 2015 -0700
@@ -13,10 +13,14 @@
 # This is a Solaris specific change to ease the transition and will not be
 # offered upstream.
 #
-diff -ur old/servconf.c new/servconf.c
---- old/servconf.c	2014-10-29 07:27:34.549410967 -0700
-+++ new/servconf.c	2014-10-29 07:27:58.775996557 -0700
-@@ -516,6 +516,28 @@
+--- orig/servconf.c	Mon Jun  1 15:37:53 2015
++++ new/servconf.c	Mon Jun  1 15:43:35 2015
+@@ -1,4 +1,3 @@
+-
+ /* $OpenBSD: servconf.c,v 1.248 2013/12/06 13:39:49 markus Exp $ */
+ /*
+  * Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
+@@ -528,6 +527,29 @@
          { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
          { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
  #endif
@@ -41,6 +45,7 @@
 +	{ "trustedanchorkeystore", sDeprecated, SSHCFG_GLOBAL },
 +	{ "useunsupportedsshv1", sDeprecated, SSHCFG_GLOBAL },
 +	{ "usefips140", sDeprecated, SSHCFG_ALL},
++	{ "gssapikeyexchange", sDeprecated, SSHCFG_ALL},
 +#endif
  	{ NULL, sBadOption, 0 }
  };