--- a/components/openssh/Makefile	Thu Jan 02 17:30:19 2014 -0800
+++ b/components/openssh/Makefile	Fri Jan 03 11:30:07 2014 -0800
@@ -18,15 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openssh
-COMPONENT_VERSION=	6.0
-COMPONENT_PORTABLE_VERSION = $(COMPONENT_VERSION)p1
-COMPONENT_PROJECT_URL=  http://www.openssh.org/
-COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_PORTABLE_VERSION)
+COMPONENT_VERSION=	6.0p1
+HUMAN_VERSION=		$(COMPONENT_VERSION)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+
+# Version for IPS.  The encoding rules are:
+#   OpenSSH <x>.<y>p<n>     => IPS <x>.<y>.0.<n>
+#   OpenSSH <x>.<y>.<z>p<n> => IPS <x>.<y>.<z>.<n>
+IPS_COMPONENT_VERSION=	6.0.0.1
+
+COMPONENT_PROJECT_URL=	http://www.openssh.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha256:589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de
 COMPONENT_ARCHIVE_URL=	http://mirror.team-cymru.org/pub/OpenBSD/OpenSSH/portable/$(COMPONENT_ARCHIVE)

--- a/components/openssh/openssh.p5m	Thu Jan 02 17:30:19 2014 -0800
+++ b/components/openssh/openssh.p5m	Fri Jan 03 11:30:07 2014 -0800
@@ -18,13 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="OPENSSH 6.0"
-set name=info.classification value=org.opensolaris.category.2008:System/Security
+set name=pkg.summary value=OpenSSH
+set name=pkg.description \
+    value="OpenSSH provides end-to-end encrypted replacement of applications such as telnet, rlogin, and ftp. Unlike these legacy applications, OpenSSH never passes anything (including user name and password) over the wire in unencrypted form. OpenSSH provides the SSH known host mechanism which verifies that the system you connect to is really the one you intended to. OpenSSH provides secure tunneling capabilities and several authentication methods. It also supports forwarding X11 connections and arbitrary TCP ports over the secure channel."
+set name=pkg.human-version value=$(HUMAN_VERSION)
+set name=com.oracle.info.description \
+    value="OpenSSH, a suite of tools that help secure network connections"
+set name=com.oracle.info.tpno value=8209
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet \
+    value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/335