[illumos-gate merge]

commit 75614fd9696d97522ed7ed8009a66eb3544d61ad
    6440 ssh packages should be replaceable

	Conflicts:
	usr/src/man/man1/Makefile
	usr/src/man/man1m/Makefile
	usr/src/man/man4/Makefile

21 files changed, 144 insertions, 151 deletions

diff --git a/manifest b/manifest
index 7bf01b3ce6..2da647d12f 100644
--- a/manifest
+++ b/manifest
@@ -11728,14 +11728,16 @@ f usr/share/man/man1/runat.1 0444 root bin
 f usr/share/man/man1/rup.1 0444 root bin
 f usr/share/man/man1/ruptime.1 0444 root bin
 f usr/share/man/man1/rusers.1 0444 root bin
-f usr/share/man/man1/scp.1 0444 root bin
+s usr/share/man/man1/scp.1=scp.sunssh.1
+f usr/share/man/man1/scp.sunssh.1 0444 root bin
 f usr/share/man/man1/script.1 0444 root bin
 f usr/share/man/man1/sdiff.1 0444 root bin
 f usr/share/man/man1/sed.1 0444 root bin
 f usr/share/man/man1/setfacl.1 0444 root bin
 f usr/share/man/man1/setpgrp.1 0444 root bin
 s usr/share/man/man1/settime.1=touch.1
-f usr/share/man/man1/sftp.1 0444 root bin
+s usr/share/man/man1/sftp.1=sftp.sunssh.1
+f usr/share/man/man1/sftp.sunssh.1 0444 root bin
 s usr/share/man/man1/sh.1=ksh93.1
 f usr/share/man/man1/shcomp.1 0444 root bin
 f usr/share/man/man1/size.1 044 root bin
@@ -12130,7 +12132,8 @@ f usr/share/man/man1m/savecore.1m 0444 root bin
 f usr/share/man/man1m/sbdadm.1m 0444 root bin
 f usr/share/man/man1m/sendmail.1m 0444 root bin
 f usr/share/man/man1m/setuname.1m 0444 root bin
-f usr/share/man/man1m/sftp-server.1m 0444 root bin
+s usr/share/man/man1m/sftp-server.1m=sftp-server.sunssh.1m
+f usr/share/man/man1m/sftp-server.sunssh.1m 0444 root bin
 f usr/share/man/man1m/share.1m 0444 root bin
 f usr/share/man/man1m/share_nfs.1m 0444 root bin
 f usr/share/man/man1m/shareall.1m 0444 root bin
diff --git a/usr/src/man/man1/Makefile b/usr/src/man/man1/Makefile
index 5e801dbfda..552ba5450e 100644
--- a/usr/src/man/man1/Makefile
+++ b/usr/src/man/man1/Makefile
@@ -333,7 +333,7 @@ MANFILES=	acctcom.1			\
 	 	rusers.1			\
 	 	rwho.1				\
 	 	sar.1				\
-	 	scp.1				\
+		scp.sunssh.1		\
 	 	script.1			\
 	 	sdiff.1				\
 	 	sed.1				\
@@ -341,7 +341,7 @@ MANFILES=	acctcom.1			\
 	 	setfacl.1			\
 	 	setlabel.1			\
 	 	setpgrp.1			\
-	 	sftp.1				\
+		sftp.sunssh.1		\
 	 	shcomp.1			\
 	 	shell_builtins.1		\
 	 	shift.1				\
@@ -515,9 +515,11 @@ MANLINKS=	batch.1		\
 		rmail.1		\
 		rmdir.1		\
 		rmumount.1	\
+		scp.1		\
 		select.1	\
 		setenv.1	\
 		settime.1	\
+		sftp.1		\
 		sh.1		\
 		snca.1		\
 		source.1	\
@@ -718,6 +720,9 @@ hashcheck.1	:= LINKSRC = spell.1
 hashmake.1	:= LINKSRC = spell.1
 spellin.1	:= LINKSRC = spell.1
 
+scp.1				:= LINKSRC = scp.sunssh.1
+sftp.1				:= LINKSRC = sftp.sunssh.1
+
 strconf.1	:= LINKSRC = strchg.1
 
 settime.1	:= LINKSRC = touch.1
diff --git a/usr/src/man/man1/scp.1 b/usr/src/man/man1/scp.sunssh.1
index c2b44aa6b9..5e61218d3d 100644
--- a/usr/src/man/man1/scp.1
+++ b/usr/src/man/man1/scp.sunssh.1
@@ -14,7 +14,6 @@ scp \- secure copy (remote file copy program)
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBscp\fR utility copies files between hosts on a network. It uses
 \fBssh\fR(1) for data transfer, and uses the same authentication and provides
@@ -26,7 +25,6 @@ Any file name may contain a host and user specification to indicate that the
 file is to be copied to/from that host. Copies between two remote hosts are
 permitted.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -164,7 +162,6 @@ and configuration problems.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -186,7 +183,6 @@ The file(s) to be copied.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -208,7 +204,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -224,12 +219,10 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrcp\fR(1), \fBssh\fR(1), \fBssh-add\fR(1), \fBssh-agent\fR(1),
 \fBssh-keygen\fR(1), \fBsshd\fR(1M), \fBssh_config\fR(4), \fBattributes\fR(5)
 .SH NOTES
-.sp
 .LP
 Generally, use of \fBscp\fR with password or keyboard-interactive
 authentication  method and two remote hosts does not work. It does work with
diff --git a/usr/src/man/man1/sftp.1 b/usr/src/man/man1/sftp.sunssh.1
index 88222d1236..3e7a285660 100644
--- a/usr/src/man/man1/sftp.1
+++ b/usr/src/man/man1/sftp.sunssh.1
@@ -29,7 +29,6 @@ sftp \- secure file transfer program
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsftp\fR utility is an interactive file transfer program with a user
 interface similar to \fBftp\fR(1) that uses the \fBssh\fR(1) command to create
@@ -53,7 +52,6 @@ The second usage format retrieves the specified file from the server and copies
 it to the specified target file or directory on the client. If a username is
 specified \fBsftp\fR tries to log in as the specified user.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -176,7 +174,6 @@ Specifies the use of protocol version 1.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -189,7 +186,6 @@ The name of the host to which \fBsftp\fR connects and logs into.
 .RE
 
 .SH INTERACTIVE COMMANDS
-.sp
 .LP
 Once in interactive mode, \fBsftp\fR understands a set of commands similar to
 those of \fBftp\fR(1). Commands are case insensitive and path names can be
@@ -555,7 +551,6 @@ Identical to the \fBhelp\fR command.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -577,7 +572,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -593,7 +587,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBftp\fR(1), \fBscp\fR(1), \fBssh\fR(1), \fBssh-add\fR(1),
 \fBssh-keygen\fR(1), \fBsshd\fR(1M), \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh-add.1 b/usr/src/man/man1/ssh-add.sunssh.1
index fc7ec94c4a..7de85f56fa 100644
--- a/usr/src/man/man1/ssh-add.1
+++ b/usr/src/man/man1/ssh-add.sunssh.1
@@ -12,7 +12,6 @@ ssh-add \- add RSA or DSA identities to the authentication agent
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBssh-add\fR utility adds \fBRSA\fR or \fBDSA\fR identities to the
 authentication agent, \fBssh-agent\fR(1). When run without arguments, it
@@ -26,7 +25,6 @@ The passphrase is read from the user's tty or by running the program defined in
 .LP
 The authentication agent must be running.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -96,7 +94,6 @@ Unlocks the agent.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBDISPLAY\fR\fR
@@ -126,7 +123,6 @@ Identifies the path of a unix-domain socket used to communicate with the agent.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -148,7 +144,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .LP
 These files should not be readable by anyone but the user. Notice that
 \fBssh-add\fR ignores a file if it is accessible by others. It is possible to
@@ -230,7 +225,6 @@ Contains the default value for SSH_ASKPASS.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -246,7 +240,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBssh-agent\fR(1), \fBssh-keygen\fR(1), \fBsshd\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh-agent.1 b/usr/src/man/man1/ssh-agent.sunssh.1
index 08efc225d8..cabafb3e59 100644
--- a/usr/src/man/man1/ssh-agent.1
+++ b/usr/src/man/man1/ssh-agent.sunssh.1
@@ -18,7 +18,6 @@ ssh-agent \- authentication agent
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBssh-agent\fR is a program to hold private keys used for public key
 authentication (\fBRSA\fR, \fBDSA\fR). \fBssh-agent\fR is often started at the
@@ -67,7 +66,6 @@ The \fBSSH_AGENT_PID\fR environment variable holds the agent's \fBPID\fR.
 The agent exits automatically when the command given on the command line
 terminates.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -133,7 +131,6 @@ specified in \fBsshd_config\fR(4). \fIlife\fR specified for an identity with
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -155,7 +152,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/tmp/ssh-XXXXXXXX/agent.\fIpid\fR\fR\fR
@@ -168,7 +164,6 @@ when the agent exits.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -184,7 +179,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBssh-add\fR(1), \fBssh-keygen\fR(1), \fBsshd\fR(1M),
 \fBsshd_config\fR(4), \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh-http-proxy-connect.1 b/usr/src/man/man1/ssh-http-proxy-connect.sunssh.1
index 51468d54d3..a12395ccb4 100644
--- a/usr/src/man/man1/ssh-http-proxy-connect.1
+++ b/usr/src/man/man1/ssh-http-proxy-connect.sunssh.1
@@ -14,12 +14,10 @@ ssh-http-proxy-connect \- Secure Shell proxy for HTTP
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A proxy command for \fBssh\fR(1) that uses HTTP CONNECT. Typical use is where
 connections external to a network are only allowed via a proxy web server.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -44,7 +42,6 @@ environment variables if they are set.
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -85,7 +82,6 @@ The numeric port number of the proxy web server to connect you to on
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 The recommended way to use a proxy connection command is to configure the
 \fBProxyCommand\fR in \fBssh_config\fR(4) (see Example 1 and Example 2).
@@ -142,7 +138,6 @@ example$ \fBssh -o'ProxyCommand="/usr/lib/ssh/ssh-http-proxy-connect \e
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBHTTPPROXY\fR\fR
@@ -172,7 +167,6 @@ Ignored if \fBHTTPPROXY\fR is not set.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -194,7 +188,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -210,7 +203,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBssh-socks5-proxy-connect\fR(1), \fBssh_config\fR(4),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh-keygen.1 b/usr/src/man/man1/ssh-keygen.sunssh.1
index ef8927f664..7468f97e7f 100644
--- a/usr/src/man/man1/ssh-keygen.1
+++ b/usr/src/man/man1/ssh-keygen.sunssh.1
@@ -64,7 +64,6 @@ ssh-keygen \- authentication key generation
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBssh-keygen\fR utility generates, manages, and converts authentication
 keys for \fBssh\fR(1). \fBssh-keygen\fR can create RSA keys for use by SSH
@@ -108,7 +107,6 @@ what the key is for, or whatever is useful. The comment is initialized to
 After a key is generated, instructions below detail where to place the keys to
 activate them.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -308,7 +306,6 @@ key to stdout.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -330,7 +327,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB$HOME/.ssh/identity\fR\fR
@@ -393,7 +389,6 @@ secret.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -409,7 +404,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBssh-add\fR(1), \fBssh-agent\fR(1), \fBsshd\fR(1M),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh-keyscan.1 b/usr/src/man/man1/ssh-keyscan.sunssh.1
index 0b59558624..f4491fccc3 100644
--- a/usr/src/man/man1/ssh-keyscan.1
+++ b/usr/src/man/man1/ssh-keyscan.sunssh.1
@@ -14,7 +14,6 @@ ssh-keyscan \- gather public ssh host keys of a number of hosts
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBssh-keyscan\fR is a utility for gathering the public ssh host keys of a
 number of hosts. It was designed to aid in building and verifying
@@ -30,7 +29,6 @@ down or do not run ssh. For scanning, one does not need login access to the
 machines that are being scanned, nor does the scanning process involve any
 encryption.
 .SS "File Format"
-.sp
 .LP
 Input format:
 .sp
@@ -66,7 +64,6 @@ Output format for \fBrsa\fR and \fBdsa\fR keys, where \fIkeytype\fR is either
 .sp
 
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -141,7 +138,6 @@ Forces to use IPv6 addresses only.
 .RE
 
 .SH SECURITY
-.sp
 .LP
 If a \fBssh_known_hosts\fR file is constructed using \fBssh-keyscan\fR without
 verifying the keys, users are vulnerable to man-in-the-middle attacks. If the
@@ -181,7 +177,6 @@ $ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e
 .sp
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/ssh_known_hosts\fR \fR
@@ -191,7 +186,6 @@ $ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -214,7 +208,6 @@ Usage error.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -230,16 +223,13 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBsshd\fR(1M), \fBattributes\fR(5)
 .SH AUTHORS
-.sp
 .LP
 David Mazieres wrote the initial version, and Wayne Davison added suppport for
 protocol version 2.
 .SH BUGS
-.sp
 .LP
 \fBssh\(emkeyscan\fR generates
 .sp
diff --git a/usr/src/man/man1/ssh-socks5-proxy-connect.1 b/usr/src/man/man1/ssh-socks5-proxy-connect.sunssh.1
index c0bcd51d1d..44903c0b9b 100644
--- a/usr/src/man/man1/ssh-socks5-proxy-connect.1
+++ b/usr/src/man/man1/ssh-socks5-proxy-connect.sunssh.1
@@ -15,7 +15,6 @@ ssh-socks5-proxy-connect \- Secure Shell proxy for SOCKS5
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 A proxy command for \fBssh\fR(1) that uses SOCKS5 (RFC 1928). Typical use is
 where connections external to a network are only allowed via a socks gateway
@@ -25,7 +24,6 @@ server.
 This proxy command does not provide any of the SOCKS5 authentication mechanisms
 defined in RFC 1928. Only anonymous connections are possible.
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -49,7 +47,6 @@ Specifies the port on which the proxy web server runs. If not specified, port
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -90,7 +87,6 @@ The numeric port number of the socks gateway to connect you to on
 .RE
 
 .SH EXAMPLES
-.sp
 .LP
 The recommended way to use a proxy connection command is to configure the
 \fBProxyCommand\fR in \fBssh_config\fR(4) (see Example 1 and Example 2).
@@ -147,7 +143,6 @@ example$ \fBssh -o'ProxyCommand=/usr/lib/ssh/ssh-socks5-proxy-connect \e
 .sp
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .ne 2
 .na
 \fB\fBSOCKS5_SERVER\fR\fR
@@ -166,7 +161,6 @@ Takes \fIsocks5_proxy_port \fR operand to specify the default proxy port.
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -188,7 +182,6 @@ An error occurred.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -204,7 +197,6 @@ Interface Stability	Stable
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBssh-http-proxy-connect\fR(1), \fBssh_config\fR(4),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man1/ssh.1 b/usr/src/man/man1/ssh.sunssh.1
index 281f44fb4a..88d8c56fdc 100644
--- a/usr/src/man/man1/ssh.1
+++ b/usr/src/man/man1/ssh.sunssh.1
@@ -22,7 +22,6 @@ ssh \- secure shell client (remote login program)
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBssh\fR (Secure Shell) is a program for logging into a remote machine and for
 executing commands on a remote machine. It is intended to replace \fBrlogin\fR
@@ -35,7 +34,6 @@ ports can also be forwarded over the secure channel.
 his or her identity to the remote machine using one of several methods
 depending on the protocol version used:
 .SS "SSH Protocol Version 1"
-.sp
 .LP
 First, if the machine the user logs in from is listed in \fB/etc/hosts.equiv\fR
 or \fB/etc/shosts.equiv\fR on the remote machine, and the user names are the
@@ -101,7 +99,6 @@ password. The password is sent to the remote host for checking. However, since
 all communications are encrypted, the password cannot be seen by someone
 listening on the network.
 .SS "SSH Protocol Version 2"
-.sp
 .LP
 The SSH version 2 protocol supports multiple user authentication methods, some
 of which are similar to those available with the SSH protocol version 1. These
@@ -144,7 +141,6 @@ encrypted using 3DES, Blowfish, CAST128 or Arcfour) and integrity
 (\fBhmac-sha1\fR, \fBhmac-md5\fR). Protocol 1 lacks a strong mechanism for
 ensuring the integrity of the connection.
 .SS "Login Session and Remote Execution"
-.sp
 .LP
 When the user's identity has been accepted by the server, the server either
 executes the specified command, or logs into the machine and gives the user a
@@ -177,7 +173,6 @@ The session terminates when the command or shell on the remote machine exits
 and all X11 and TCP/IP connections have been closed. The exit status of the
 remote program is returned as the exit status of \fBssh\fR.
 .SS "Escape Characters"
-.sp
 .LP
 When a pseudo-terminal has been requested, \fBssh\fR supports a number of
 functions through the use of an escape character.
@@ -268,7 +263,6 @@ if the peer supports it.
 .RE
 
 .SS "X11 and TCP Forwarding"
-.sp
 .LP
 If the \fBForwardX11\fR variable is set to ``\fByes\fR'' (or, see the
 description of the \fB-X\fR and \fB-x\fR options described later) and the user
@@ -306,7 +300,6 @@ specified either on the command line or in a configuration file. One possible
 application of TCP/IP forwarding is a secure connection to an electronic purse.
 Another possible application is firewall traversal.
 .SS "Server Authentication"
-.sp
 .LP
 \fBssh\fR automatically maintains and checks a database containing
 identifications for all hosts it has ever been used with. Host keys are stored
@@ -332,7 +325,6 @@ When the user's GSS-API credentials expire, the client continues to be able to
 rekey the session using the server's public host key to protect the key
 exchanges.
 .SS "GSS-API User and Server Authentication"
-.sp
 .LP
 \fBssh\fR uses the user's GSS-API credentials to authenticate the client to the
 server wherever possible, if \fBGssKeyEx\fR and/or \fBGssAuthentication\fR are
@@ -362,7 +354,6 @@ GSS-API user authorization is covered in \fBgss_auth_rules\fR(5).
 Rekeying can be used to redelegate credentials when \fBGssKeyEx\fR is
 "\fByes\fR". (See \fB~R\fR under \fBEscape Characters\fR above.)
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -811,7 +802,6 @@ means that they have full access to the original X11 display.
 .RE
 
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 \fBssh\fR normally sets the following environment variables:
 .sp
@@ -886,13 +876,11 @@ See the \fBENVIRONMENT VARIABLES\fR section in the \fBsshd\fR(1M) man page for
 more information on how locale setting can be further changed depending on
 server side configuration.
 .SH EXIT STATUS
-.sp
 .LP
 The status of the remote program is returned as the exit status of \fBssh\fR.
 \fB255\fR is returned if an error occurred at anytime during the \fBssh\fR
 connection, including the initial key exchange.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB$HOME/.ssh/known_hosts\fR\fR
@@ -958,7 +946,6 @@ VARIABLES.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -978,7 +965,6 @@ Interface Stability	See below.
 The command line syntax is Committed. The remote locale selection through
 passing \fBLC_*\fR environment variables is Uncommitted.
 .SH SEE ALSO
-.sp
 .LP
 \fBrlogin\fR(1), \fBrsh\fR(1), \fBscp\fR(1), \fBssh-add\fR(1),
 \fBssh-agent\fR(1), \fBssh-keygen\fR(1), \fBssh-http-proxy-connect\fR(1),
diff --git a/usr/src/man/man1m/Makefile b/usr/src/man/man1m/Makefile
index 7c50753a61..3080549c1e 100644
--- a/usr/src/man/man1m/Makefile
+++ b/usr/src/man/man1m/Makefile
@@ -456,7 +456,7 @@ _MANFILES=	6to4relay.1m		\
 		sdpadm.1m		\
 		sendmail.1m		\
 		setuname.1m		\
-		sftp-server.1m		\
+		sftp-server.sunssh.1m	\
 		share.1m		\
 		share_nfs.1m		\
 		shareall.1m		\
@@ -645,6 +645,7 @@ MANLINKS=	acctcon1.1m			\
 		sa1.1m				\
 		sa2.1m				\
 		sadc.1m				\
+		sftp-server.1m			\
 		shutacct.1m			\
 		sprayd.1m			\
 		startup.1m			\
@@ -719,6 +720,8 @@ hal-set-property.1m		:= LINKSRC = hal-get-property.1m
 
 poweroff.1m			:= LINKSRC = halt.1m
 
+sftp-server.1m			:= LINKSRC = sftp-server.sunssh.1m
+
 comsat.1m			:= LINKSRC = in.comsat.1m
 fingerd.1m			:= LINKSRC = in.fingerd.1m
 rarpd.1m			:= LINKSRC = in.rarpd.1m
diff --git a/usr/src/man/man1m/sftp-server.1m b/usr/src/man/man1m/sftp-server.sunssh.1m
index c258aa81fb..c258aa81fb 100644
--- a/usr/src/man/man1m/sftp-server.1m
+++ b/usr/src/man/man1m/sftp-server.sunssh.1m
diff --git a/usr/src/man/man1m/ssh-keysign.1m b/usr/src/man/man1m/ssh-keysign.sunssh.1m
index 1ab228a28a..8b3836e8de 100644
--- a/usr/src/man/man1m/ssh-keysign.1m
+++ b/usr/src/man/man1m/ssh-keysign.sunssh.1m
@@ -13,7 +13,6 @@ ssh-keysign \- ssh helper program for host-based authentication
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBssh-keysign\fR is used by \fBssh\fR(1) to access the local host keys and
 generate the digital signature required during host-based authentication with
@@ -30,7 +29,6 @@ client configuration file \fB/etc/ssh/ssh_config\fR by setting
 \fBssh\fR. See \fBssh\fR(1) and \fBsshd\fR(1M) for more information about
 host-based authentication.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/ssh/ssh_config\fR\fR
@@ -56,7 +54,6 @@ must be \fBset-uid\fR root if host-based authentication is used.
 .RE
 
 .SH SECURITY
-.sp
 .LP
 ssh-keysign will not sign host-based authentication data under the following
 conditions:
@@ -83,7 +80,6 @@ authentication data, there remains the ability of users to use it as an avenue
 for obtaining the client's private host keys. For this reason host-based
 authentication is turned off by default.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -99,14 +95,11 @@ Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBssh\fR(1), \fBsshd\fR(1M), \fBssh_config\fR(4), \fBattributes\fR(5)
 .SH AUTHORS
-.sp
 .LP
 Markus Friedl, \fBmarkus@openbsd.org\fR
 .SH HISTORY
-.sp
 .LP
 \fBssh-keysign\fR first appeared in Ox 3.2.
diff --git a/usr/src/man/man1m/sshd.1m b/usr/src/man/man1m/sshd.sunssh.1m
index e01b7c746b..8df6378332 100644
--- a/usr/src/man/man1m/sshd.1m
+++ b/usr/src/man/man1m/sshd.sunssh.1m
@@ -14,7 +14,6 @@ sshd \- secure shell daemon
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsshd\fR (Secure Shell daemon) is the daemon program for \fBssh\fR(1).
 Together these programs replace \fBrlogin\fR and \fBrsh\fR, and provide secure
@@ -37,7 +36,6 @@ instructions in \fBsshd_config\fR(4).
 Support for v1 is provided to help sites with existing \fBssh\fR v1 clients and
 servers to transition to v2. v1 might not be supported in a future release.
 .SS "SSH Protocol Version 1"
-.sp
 .LP
 Each host has a host-specific RSA key (normally 1024 bits) used to identify the
 host. Additionally, when the daemon starts, it generates a server RSA key
@@ -68,7 +66,6 @@ System security is not improved unless \fBrshd\fR(1M), \fBrlogind\fR(1M),
 \fBrexecd\fR(1M), and \fBrexd\fR(1M) are disabled (thus completely disabling
 \fBrlogin\fR(1) and \fBrsh\fR(1) into the machine).
 .SS "SSH Protocol Version 2"
-.sp
 .LP
 Version 2 works similarly to version 1: Each host has a host-specific DSA/RSA
 key. However, when the daemon starts, it does not generate a server key.
@@ -85,7 +82,6 @@ Protocol version 2 provides a public key based user authentication method
 authentication, and a generic prompt/reply protocol for password-based
 authentication.
 .SS "Command Execution and Data Forwarding"
-.sp
 .LP
 If the client successfully authenticates itself, a dialog for preparing the
 session is entered. At this time the client can request things like allocating
@@ -113,7 +109,6 @@ options override values specified in the configuration file.
 \fBSIGHUP\fR, by executing itself with the name it was started as, that is,
 \fB/usr/lib/ssh/sshd\fR.
 .SS "Host Access Control"
-.sp
 .LP
 The \fBsshd\fR daemon uses TCP Wrappers to restrict access to hosts. It uses
 the service name of \fBsshd\fR for \fBhosts_access()\fR. For more information
@@ -122,7 +117,6 @@ are part of the \fBSUNWsfman\fR package (they are not SunOS man pages). TCP
 wrappers binaries, including \fBlibwrap\fR, are in \fBSUNWtcpd\fR, a required
 package for \fBSUNWsshdu\fR, the package containing \fBsshd\fR.
 .SH OPTIONS
-.sp
 .LP
 The options for \fBsshd\fR are as follows:
 .sp
@@ -308,7 +302,6 @@ Forces \fBsshd\fR to use IPv6 addresses only.
 
 .SH EXTENDED DESCRIPTION
 .SS "\fBauthorized_keys\fR File Format"
-.sp
 .LP
 The \fB$HOME/.ssh/authorized_keys\fR file lists the public keys that are
 permitted for RSA authentication in protocol version 1 and for public key
@@ -482,7 +475,6 @@ or addresses.
 .RE
 
 .SS "\fBssh_known_hosts\fR File Format"
-.sp
 .LP
 The \fB/etc/ssh/ssh_known_hosts\fR and \fB$HOME/.ssh/known_hosts\fR files
 contain host public keys for all known hosts. The global file should be
@@ -556,7 +548,6 @@ definitely not type in the host keys by hand. Rather, generate them by a script
 or by taking \fB/etc/ssh/ssh_host_rsa_key.pub\fR and adding the host names at
 the front.
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 \fBsshd\fR sets the following environment variables for commands executed by
 \fBssh\fR users:
@@ -752,7 +743,6 @@ Set to the name of the user logging in.
 Additionally, \fBsshd\fR reads \fB$HOME/.ssh/environment\fR and adds lines of
 the format \fBVARNAME=\fIvalue\fR\fR to the environment.
 .SH EXAMPLES
-.sp
 .LP
 In the following examples, certain lines might wrap due to line length limits
 in your display. You should nevertheless consider the wrapped line as a single
@@ -822,7 +812,6 @@ closenet,closenet.hut.fi,...,130.233.208.41 ssh-rsa AA..8= closenet.hut.fi
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -844,7 +833,6 @@ An error occurred.
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/default/login\fR\fR
@@ -1207,7 +1195,6 @@ and should be world-readable.
 .RE
 
 .SH SECURITY
-.sp
 .LP
 \fBsshd\fR supports the use of several user authentication mechanisms: a public
 key system where keys are associated with users (through users'
@@ -1302,7 +1289,6 @@ if \fBpam_acct_mgmt()\fR once again returns \fBPAM_NEW_AUTHTOK_REQD\fR. By this
 means, administrators are able to control what authentication methods are
 allowed for SSHv2 on a per-user basis.
 .SS "Setting up Host-based Authentication"
-.sp
 .LP
 To establish host-based authentication, you must perform the following steps:
 .RS +4
@@ -1395,7 +1381,6 @@ For the vast majority of network environments, \fB\&.shosts\fR is preferred
 over \fB\&.rhosts\fR.
 .RE
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -1414,7 +1399,6 @@ Interface Stability	Evolving
 .LP
 The interface stability of \fB/etc/ssh/moduli\fR is Private.
 .SH SEE ALSO
-.sp
 .LP
 \fBlogin\fR(1), \fBscp\fR(1), \fBssh\fR(1), \fBssh-add\fR(1),
 \fBssh-agent\fR(1), \fBssh-keygen\fR(1), \fBsvcs\fR(1),
@@ -1426,7 +1410,6 @@ The interface stability of \fB/etc/ssh/moduli\fR is Private.
 .LP
 \fI\fR
 .SH NOTES
-.sp
 .LP
 The \fBsshd\fR service is managed by the service management facility,
 \fBsmf\fR(5), under the service identifier:
diff --git a/usr/src/man/man4/ssh_config.4 b/usr/src/man/man4/ssh_config.sunssh.4
index 31bc180f87..57a94dd03c 100644
--- a/usr/src/man/man4/ssh_config.4
+++ b/usr/src/man/man4/ssh_config.sunssh.4
@@ -20,7 +20,6 @@ ssh_config \- ssh configuration file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The first \fBssh_config\fR path, above, provides the system-wide defaults for
 \fBssh\fR(1). The second version is user-specific defaults for \fBssh\fR.
@@ -901,7 +900,6 @@ Specifies the location of the \fBxauth\fR(1) program. The default is
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBrsh\fR(1), \fBssh\fR(1), \fBssh-http-proxy-connect\fR(1),
 \fBssh-keygen\fR(1), \fBssh-socks5-proxy-connect\fR(1), \fBsshd\fR(1M),
diff --git a/usr/src/man/man4/sshd_config.4 b/usr/src/man/man4/sshd_config.sunssh.4
index bdc044886d..ef134886a2 100644
--- a/usr/src/man/man4/sshd_config.4
+++ b/usr/src/man/man4/sshd_config.sunssh.4
@@ -14,7 +14,6 @@ sshd_config \- sshd configuration file
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBsshd\fR(1M) daemon reads configuration data from
 \fB/etc/ssh/sshd_config\fR (or the file specified with \fBsshd\fR \fB-f\fR on
@@ -877,7 +876,6 @@ is enabled.
 .RE
 
 .SS "Time Formats"
-.sp
 .LP
 \fBsshd\fR command-line arguments and configuration file options that specify
 time can be expressed using a sequence of the form:
@@ -969,7 +967,6 @@ value. For example:
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/ssh/sshd_config\fR\fR
@@ -981,7 +978,6 @@ world-readable.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -997,12 +993,10 @@ Interface Stability	Uncommitted
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlogin\fR(1), \fBsshd\fR(1M), \fBchroot\fR(2), \fBssh_config\fR(4),
 \fBattributes\fR(5), \fBkerberos\fR(5)
 .SH AUTHORS
-.sp
 .LP
 OpenSSH is a derivative of the original and free \fBssh\fR 1.2.12 release by
 Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo de
diff --git a/usr/src/pkg/manifests/network-ssh-ssh-key.mf b/usr/src/pkg/manifests/network-ssh-ssh-key.mf
index 149a7fd920..01402bb985 100644
--- a/usr/src/pkg/manifests/network-ssh-ssh-key.mf
+++ b/usr/src/pkg/manifests/network-ssh-ssh-key.mf
@@ -33,15 +33,28 @@ dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
 dir path=usr/lib/ssh
+dir path=usr/lib/sunssh
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
-file path=usr/bin/ssh-keygen mode=0555
-file path=usr/bin/ssh-keyscan mode=0555
-file path=usr/lib/ssh/ssh-keysign mode=4555
-file path=usr/share/man/man1/ssh-keygen.1
-file path=usr/share/man/man1/ssh-keyscan.1
-file path=usr/share/man/man1m/ssh-keysign.1m
+file path=usr/lib/sunssh/ssh-keygen mode=0555
+file path=usr/lib/sunssh/ssh-keyscan mode=0555
+file path=usr/lib/sunssh/ssh-keysign mode=4555
+file path=usr/share/man/man1/ssh-keygen.sunssh.1
+file path=usr/share/man/man1/ssh-keyscan.sunssh.1
+file path=usr/share/man/man1m/ssh-keysign.sunssh.1m
 legacy pkg=SUNWsshcu desc="Secure Shell protocol common Utilities" \
     name="SSH Common, (Usr)"
 license usr/src/cmd/ssh/THIRDPARTYLICENSE \
     license=usr/src/cmd/ssh/THIRDPARTYLICENSE
+link path=usr/bin/ssh-keygen mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/ssh-keygen
+link path=usr/bin/ssh-keyscan mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/ssh-keyscan
+link path=usr/lib/ssh/ssh-keysign mediator=ssh mediator-implementation=sunssh \
+    target=../sunssh/ssh-keysign
+link path=usr/share/man/man1/ssh-keygen.1 mediator=ssh \
+    mediator-implementation=sunssh target=ssh-keygen.sunssh.1
+link path=usr/share/man/man1/ssh-keyscan.1 mediator=ssh \
+    mediator-implementation=sunssh target=ssh-keyscan.sunssh.1
+link path=usr/share/man/man1m/ssh-keysign.1m mediator=ssh \
+    mediator-implementation=sunssh target=ssh-keysign.sunssh.1m
diff --git a/usr/src/pkg/manifests/network-ssh.mf b/usr/src/pkg/manifests/network-ssh.mf
index 0b1d446fbe..83cf5e42a7 100644
--- a/usr/src/pkg/manifests/network-ssh.mf
+++ b/usr/src/pkg/manifests/network-ssh.mf
@@ -36,28 +36,24 @@ dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/lib
 dir path=usr/lib/ssh
+dir path=usr/lib/sunssh
 dir path=usr/share/man
 dir path=usr/share/man/man1
-dir path=usr/share/man/man4
-file path=etc/ssh/moduli group=sys
-file path=etc/ssh/ssh_config group=sys \
-    original_name=SUNWssh:etc/ssh/ssh_config preserve=true
-file path=usr/bin/scp mode=0555
-file path=usr/bin/sftp mode=0555
-file path=usr/bin/ssh mode=0555
-file path=usr/bin/ssh-add mode=0555
-file path=usr/bin/ssh-agent mode=0555
-file path=usr/lib/ssh/ssh-askpass mode=0555
-file path=usr/lib/ssh/ssh-http-proxy-connect mode=0555
-file path=usr/lib/ssh/ssh-socks5-proxy-connect mode=0555
-file path=usr/share/man/man1/scp.1
-file path=usr/share/man/man1/sftp.1
-file path=usr/share/man/man1/ssh-add.1
-file path=usr/share/man/man1/ssh-agent.1
-file path=usr/share/man/man1/ssh-http-proxy-connect.1
-file path=usr/share/man/man1/ssh-socks5-proxy-connect.1
-file path=usr/share/man/man1/ssh.1
-file path=usr/share/man/man4/ssh_config.4
+file path=usr/lib/sunssh/scp mode=0555
+file path=usr/lib/sunssh/sftp mode=0555
+file path=usr/lib/sunssh/ssh mode=0555
+file path=usr/lib/sunssh/ssh-add mode=0555
+file path=usr/lib/sunssh/ssh-agent mode=0555
+file path=usr/lib/sunssh/ssh-askpass mode=0555
+file path=usr/lib/sunssh/ssh-http-proxy-connect mode=0555
+file path=usr/lib/sunssh/ssh-socks5-proxy-connect mode=0555
+file path=usr/share/man/man1/scp.sunssh.1
+file path=usr/share/man/man1/sftp.sunssh.1
+file path=usr/share/man/man1/ssh-add.sunssh.1
+file path=usr/share/man/man1/ssh-agent.sunssh.1
+file path=usr/share/man/man1/ssh-http-proxy-connect.sunssh.1
+file path=usr/share/man/man1/ssh-socks5-proxy-connect.sunssh.1
+file path=usr/share/man/man1/ssh.sunssh.1
 legacy pkg=SUNWsshr \
     desc="Secure Shell protocol Client and associated Utilities" \
     name="SSH Client and utilities, (Root)"
@@ -66,3 +62,34 @@ legacy pkg=SUNWsshu \
     name="SSH Client and utilities, (Usr)"
 license usr/src/cmd/ssh/THIRDPARTYLICENSE \
     license=usr/src/cmd/ssh/THIRDPARTYLICENSE
+link path=usr/bin/scp mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/scp
+link path=usr/bin/sftp mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/sftp
+link path=usr/bin/ssh mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/ssh
+link path=usr/bin/ssh-add mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/ssh-add
+link path=usr/bin/ssh-agent mediator=ssh mediator-implementation=sunssh \
+    target=../lib/sunssh/ssh-agent
+link path=usr/lib/ssh/ssh-askpass mediator=ssh mediator-implementation=sunssh \
+    target=../sunssh/ssh-askpass
+link path=usr/lib/ssh/ssh-http-proxy-connect mediator=ssh \
+    mediator-implementation=sunssh target=../sunssh/ssh-http-proxy-connect
+link path=usr/lib/ssh/ssh-socks5-proxy-connect mediator=ssh \
+    mediator-implementation=sunssh target=../sunssh/ssh-socks5-proxy-connect
+link path=usr/share/man/man1/scp.1 mediator=ssh mediator-implementation=sunssh \
+    target=scp.sunssh.1
+link path=usr/share/man/man1/sftp.1 mediator=ssh \
+    mediator-implementation=sunssh target=sftp.sunssh.1
+link path=usr/share/man/man1/ssh-add.1 mediator=ssh \
+    mediator-implementation=sunssh target=ssh-add.sunssh.1
+link path=usr/share/man/man1/ssh-agent.1 mediator=ssh \
+    mediator-implementation=sunssh target=ssh-agent.sunssh.1
+link path=usr/share/man/man1/ssh-http-proxy-connect.1 mediator=ssh \
+    mediator-implementation=sunssh target=ssh-http-proxy-connect.sunssh.1
+link path=usr/share/man/man1/ssh-socks5-proxy-connect.1 mediator=ssh \
+    mediator-implementation=sunssh target=socks5-proxy-connect.sunssh.1
+link path=usr/share/man/man1/ssh.1 mediator=ssh mediator-implementation=sunssh \
+    target=ssh.sunssh.1
+depend fmri=service/network/ssh-common type=require
diff --git a/usr/src/pkg/manifests/service-network-ssh-common.mf b/usr/src/pkg/manifests/service-network-ssh-common.mf
new file mode 100644
index 0000000000..130a04235c
--- /dev/null
+++ b/usr/src/pkg/manifests/service-network-ssh-common.mf
@@ -0,0 +1,48 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Alexander Pyhalov
+#
+
+set name=pkg.fmri value=pkg:/service/network/ssh-common@$(PKGVERS)
+set name=pkg.description \
+    value="Provides configuration files and server support for the Secure Shell (SSH) service which creates RSA and DSA host keys if they are not available and start or stop the sshd (Secure Shell daemon)."
+set name=pkg.summary \
+    value="Secure Shell (SSH) service and configuration files"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Security
+set name=variant.arch value=$(ARCH)
+dir path=etc group=sys
+dir path=etc/ssh group=sys
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/network group=sys
+dir path=lib/svc/method
+dir path=usr group=sys
+dir path=usr/share/man
+dir path=usr/share/man/man4
+file path=etc/ssh/moduli group=sys preserve=true
+file path=etc/ssh/ssh_config group=sys \
+    original_name=network/ssh:etc/ssh/ssh_config preserve=true
+file path=etc/ssh/sshd_config group=sys \
+    original_name=service/network/ssh:etc/ssh/sshd_config preserve=true
+file path=lib/svc/manifest/network/ssh.xml group=sys mode=0444
+file path=lib/svc/method/sshd mode=0555
+file path=usr/share/man/man4/ssh_config.sunssh.4
+file path=usr/share/man/man4/sshd_config.sunssh.4
+license usr/src/cmd/ssh/THIRDPARTYLICENSE \
+    license=usr/src/cmd/ssh/THIRDPARTYLICENSE
+link path=usr/share/man/man4/ssh_config.4 mediator=ssh \
+    mediator-implementation=sunssh target=ssh_config.sunssh.4
+link path=usr/share/man/man4/sshd_config.4 mediator=ssh \
+    mediator-implementation=sunssh target=sshd_config.sunssh.4
diff --git a/usr/src/pkg/manifests/service-network-ssh.mf b/usr/src/pkg/manifests/service-network-ssh.mf
index 4eb273cfcf..e2968f47a2 100644
--- a/usr/src/pkg/manifests/service-network-ssh.mf
+++ b/usr/src/pkg/manifests/service-network-ssh.mf
@@ -31,30 +31,29 @@ set name=info.classification \
 set name=variant.arch value=$(ARCH)
 dir path=etc group=sys
 dir path=etc/ssh group=sys
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/network group=sys
-dir path=lib/svc/method
 dir path=usr group=sys
 dir path=usr/lib
 dir path=usr/lib/ssh
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man4
-file path=etc/ssh/sshd_config group=sys \
-    original_name=SUNWsshd:etc/ssh/sshd_config preserve=true
-file path=lib/svc/manifest/network/ssh.xml group=sys mode=0444
-file path=lib/svc/method/sshd mode=0555
-file path=usr/lib/ssh/sftp-server mode=0555
-file path=usr/lib/ssh/sshd mode=0555
-file path=usr/share/man/man1m/sftp-server.1m
-file path=usr/share/man/man1m/sshd.1m
-file path=usr/share/man/man4/sshd_config.4
+file path=usr/lib/sunssh/sftp-server mode=0555
+file path=usr/lib/sunssh/sshd mode=0555
+file path=usr/share/man/man1m/sftp-server.sunssh.1m
+file path=usr/share/man/man1m/sshd.sunssh.1m
 legacy pkg=SUNWsshdr desc="Secure Shell protocol Server" \
     name="SSH Server, (Root)"
 legacy pkg=SUNWsshdu desc="Secure Shell protocol Server" \
     name="SSH Server, (Usr)"
 license usr/src/cmd/ssh/THIRDPARTYLICENSE \
     license=usr/src/cmd/ssh/THIRDPARTYLICENSE
+link path=usr/lib/ssh/sftp-server mediator=ssh mediator-implementation=sunssh \
+    target=../sunssh/sftp-server
+link path=usr/lib/ssh/sshd mediator=ssh mediator-implementation=sunssh \
+    target=../sunssh/sshd
+link path=usr/share/man/man1m/sftp-server.1m mediator=ssh \
+    mediator-implementation=sunssh target=sftp-server.sunssh.1m
+link path=usr/share/man/man1m/sshd.1m mediator=ssh \
+    mediator-implementation=sunssh target=sshd.sunssh.1m
+depend fmri=service/network/ssh-common type=require
 depend fmri=text/locale type=require