--- a/components/openca-ocspd/Makefile	Fri Jul 15 12:46:17 2016 -0700
+++ b/components/openca-ocspd/Makefile	Fri Jul 15 14:47:35 2016 -0700
@@ -56,6 +56,8 @@
 
 COMPONENT_BUILD_ENV +=  PATH="$(PATH):$(POD2MAN_PATH)"
 
+COMPONENT_PRE_BUILD_ACTION = $(CP) $(COMPONENT_SRC)/docs/ocspd.3.pod $(@D)/docs
+
 REQUIRED_PACKAGES += library/security/ocsp/libpki
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140

--- a/components/openca-ocspd/openca-ocspd.p5m	Fri Jul 15 12:46:17 2016 -0700
+++ b/components/openca-ocspd/openca-ocspd.p5m	Fri Jul 15 14:47:35 2016 -0700
@@ -52,6 +52,6 @@
 file path=usr/bin/ocspd-genreq.sh
 file path=usr/lib/$(MACH64)/pkgconfig/openca-ocspd.pc
 file usr/sbin/ocspd path=usr/lib/ocspd mode=0555
-file ocspd.3 path=usr/share/man/man3/ocspd.3
+file path=usr/share/man/man3/ocspd.3
 file ocspd.conf.3 path=usr/share/man/man3/ocspd.conf.3
 license openca-ocspd.license license=Apache

--- a/components/openca-ocspd/patches/03-pod.patch	Fri Jul 15 12:46:17 2016 -0700
+++ b/components/openca-ocspd/patches/03-pod.patch	Fri Jul 15 14:47:35 2016 -0700
@@ -1,11 +1,64 @@
 Patch origin: in-house
-Patch status: not Solaris-specific; suitable for upstream
+Patch status: Solaris-specific; not suitable for upstream
+
+The daemon name is just ocspd on Solaris.
+
+The description is outdated. It needs to reflect what we have on Solaris.
+
+ocspd's configuration file is /etc/ocspd/ocspd.xml on Solaris.
 
 Syntax error. =back is missing.
 
---- openca-ocspd-3.1.2/docs/ocspd.3.pod	Tue Nov 10 13:31:40 2015
-+++ openca-ocspd-3.1.2/docs/ocspd.3.pod	Thu Dec 17 13:07:42 2015
-@@ -114,4 +114,4 @@
+--- openca-ocspd-3.1.2/docs/ocspd.3.pod	2016-07-06 15:54:02.146059031 -0700
++++ openca-ocspd-3.1.2/docs/ocspd.3.pod	2016-07-14 13:33:06.330761183 -0700
+@@ -3,11 +3,11 @@
+ 
+ =head1 NAME
+ 
+-	openca-ocspd - OCSP Daemon
++	ocspd - OCSP Daemon
+ 
+ =head1 SYNOPSIS
+ 
+-B<openca-ocspd>
++B<ocspd>
+ [B<-d>]
+ [B<-p n>]
+ [B<-b address>]
+@@ -21,9 +21,11 @@
+ 
+ =head1 DESCRIPTION
+ 
+-The B<openca-ocspd> is an RFC2560 compliant OCSPD responder. It can
+-be used to verify the status of a certificate using OCSP clients
+-(such as Mozilla/Netscape7).
++The B<ocspd> is an RFC2560 compliant Online Certificate Status Protocol (OCSP)
++responder. The responder is capable of answering complex OCSP requests and it
++can be used to verify the status of a certificate from OCSP clients. An example
++of a configuration file and a way to start and make requests to the responder
++can be found in the /etc/ocspd directory.
+ 
+ =head1 OPTIONS
+ 
+@@ -45,7 +47,7 @@
+ =item B<-c file>
+ 
+ specifies the configuration file to be loaded. Default file loaded
+-is B</usr/local/etc/ocspd.conf>.
++is B</etc/ocspd/ocspd.xml>.
+ 
+ =item B<-md digest>
+ 
+@@ -94,7 +96,7 @@
+ 
+ =over 4
+ 
+-	openca-ocspd -c contrib/ocspd.conf 
++	ocspd -c /etc/ocspd/ocspd.xml
+ 
+ =back
+ 
+@@ -114,4 +116,4 @@
  
  =cut