--- a/components/cyrus-sasl/libsasl2.p5m	Wed Apr 27 16:15:18 2016 -0700
+++ b/components/cyrus-sasl/libsasl2.p5m	Wed Apr 27 16:55:22 2016 -0700
@@ -42,7 +42,7 @@
     value=org.opensolaris.category.2008:System/Libraries
 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/2015/194
+set name=org.opensolaris.arc-caseid value=PSARC/2015/194 value=PSARC/2016/158
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir  path=etc/sasl2 owner=root group=sys mode=0755
 file README path=etc/sasl2/README
@@ -58,9 +58,7 @@
 link path=usr/lib/$(MACH64)/libsasl2.so target=libsasl2.so.3.0.0
 link path=usr/lib/$(MACH64)/libsasl2.so.3 target=libsasl2.so.3.0.0
 file path=usr/lib/$(MACH64)/libsasl2.so.3.0.0
-link path=usr/lib/$(MACH64)/llib-lsasl target=../llib-lsasl2
 link path=usr/lib/$(MACH64)/llib-lsasl.ln target=llib-lsasl2.ln
-link path=usr/lib/$(MACH64)/llib-lsasl2 target=../llib-lsasl2
 file path=usr/lib/$(MACH64)/llib-lsasl2.ln
 link path=usr/lib/$(MACH64)/pkgconfig/libsasl.pc target=libsasl2.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libsasl2.pc
@@ -134,6 +132,28 @@
 file advanced.html path=usr/share/doc/libsasl2/advanced.html
 file appconvert.html path=usr/share/doc/libsasl2/appconvert.html
 file components.html path=usr/share/doc/libsasl2/components.html
+file draft-burdis-cat-srp-sasl-xx.txt \
+    path=usr/share/doc/libsasl2/draft-burdis-cat-srp-sasl-xx.txt
+file draft-ietf-sasl-anon-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-anon-xx.txt
+file draft-ietf-sasl-crammd5-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-crammd5-xx.txt
+file draft-ietf-sasl-gssapi-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-gssapi-xx.txt
+file draft-ietf-sasl-plain-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-plain-xx.txt
+file draft-ietf-sasl-rfc2222bis-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-rfc2222bis-xx.txt
+file draft-ietf-sasl-rfc2831bis-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-rfc2831bis-xx.txt
+file draft-ietf-sasl-saslprep-xx.txt \
+    path=usr/share/doc/libsasl2/draft-ietf-sasl-saslprep-xx.txt
+file draft-murchison-sasl-login-xx.txt \
+    path=usr/share/doc/libsasl2/draft-murchison-sasl-login-xx.txt
+file draft-newman-sasl-c-api-xx.txt \
+    path=usr/share/doc/libsasl2/draft-newman-sasl-c-api-xx.txt
+file draft-newman-sasl-passdss-xx.txt \
+    path=usr/share/doc/libsasl2/draft-newman-sasl-passdss-xx.txt
 file gssapi.html path=usr/share/doc/libsasl2/gssapi.html
 file index.html path=usr/share/doc/libsasl2/index.html
 file install.html path=usr/share/doc/libsasl2/install.html
@@ -142,6 +162,19 @@
 file options.html path=usr/share/doc/libsasl2/options.html
 file plugprog.html path=usr/share/doc/libsasl2/plugprog.html
 file programming.html path=usr/share/doc/libsasl2/programming.html
+file rfc1321.txt path=usr/share/doc/libsasl2/rfc1321.txt
+file rfc1939.txt path=usr/share/doc/libsasl2/rfc1939.txt
+file rfc2104.txt path=usr/share/doc/libsasl2/rfc2104.txt
+file rfc2195.txt path=usr/share/doc/libsasl2/rfc2195.txt
+file rfc2222.txt path=usr/share/doc/libsasl2/rfc2222.txt
+file rfc2243.txt path=usr/share/doc/libsasl2/rfc2243.txt
+file rfc2245.txt path=usr/share/doc/libsasl2/rfc2245.txt
+file rfc2289.txt path=usr/share/doc/libsasl2/rfc2289.txt
+file rfc2444.txt path=usr/share/doc/libsasl2/rfc2444.txt
+file rfc2595.txt path=usr/share/doc/libsasl2/rfc2595.txt
+file rfc2831.txt path=usr/share/doc/libsasl2/rfc2831.txt
+file rfc2945.txt path=usr/share/doc/libsasl2/rfc2945.txt
+file rfc3174.txt path=usr/share/doc/libsasl2/rfc3174.txt
 file sysadmin.html path=usr/share/doc/libsasl2/sysadmin.html
 file upgrading.html path=usr/share/doc/libsasl2/upgrading.html
 file windows.html path=usr/share/doc/libsasl2/windows.html