--- a/components/bison/bison.p5m	Thu Jan 14 10:01:14 2016 -0800
+++ b/components/bison/bison.p5m	Thu Jan 14 10:17:27 2016 -0800
@@ -20,10 +20,10 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+<transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
 set name=pkg.fmri \
     value=pkg:/developer/parser/bison@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="bison - A YACC Replacement"
@@ -35,25 +35,56 @@
     value="org.opensolaris.category.2008:Development/Other Languages"
 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/2007/289
+set name=org.opensolaris.arc-caseid value=PSARC/2007/289 value=PSARC/2015/549
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file usr/bin/$(MACH64)/bison path=usr/bin/bison
 link path=usr/sfw/bin/bison target=../../bin/bison
 file path=usr/share/aclocal/bison-i18n.m4
 file path=usr/share/bison/README
+file path=usr/share/bison/bison.m4
+file path=usr/share/bison/c++-skel.m4
 file path=usr/share/bison/c++.m4
+file path=usr/share/bison/c-like.m4
+file path=usr/share/bison/c-skel.m4
 file path=usr/share/bison/c.m4
 file path=usr/share/bison/glr.c
 file path=usr/share/bison/glr.cc
+file path=usr/share/bison/java-skel.m4
+file path=usr/share/bison/java.m4
 file path=usr/share/bison/lalr1.cc
+file path=usr/share/bison/lalr1.java
 file path=usr/share/bison/location.cc
+file path=usr/share/bison/m4sugar/foreach.m4
 file path=usr/share/bison/m4sugar/m4sugar.m4
+file path=usr/share/bison/stack.hh
+file path=usr/share/bison/variant.hh
+file path=usr/share/bison/xslt/bison.xsl
+file path=usr/share/bison/xslt/xml2dot.xsl
+file path=usr/share/bison/xslt/xml2text.xsl
+file path=usr/share/bison/xslt/xml2xhtml.xsl
 file path=usr/share/bison/yacc.c
+file path=usr/share/doc/bison/AUTHORS
+file path=usr/share/doc/bison/COPYING
+file path=usr/share/doc/bison/NEWS
+file path=usr/share/doc/bison/README
+file path=usr/share/doc/bison/THANKS
+file path=usr/share/doc/bison/TODO
+file path=usr/share/doc/bison/examples/calc++/calc++-driver.cc
+file path=usr/share/doc/bison/examples/calc++/calc++-driver.hh
+file path=usr/share/doc/bison/examples/calc++/calc++-parser.yy
+file path=usr/share/doc/bison/examples/calc++/calc++-scanner.ll
+file path=usr/share/doc/bison/examples/calc++/calc++.cc
+file path=usr/share/doc/bison/examples/mfcalc/calc.h
+file path=usr/share/doc/bison/examples/mfcalc/mfcalc.y
+file path=usr/share/doc/bison/examples/rpcalc/rpcalc.y
 file path=usr/share/info/bison.info
 file path=usr/share/locale/da/LC_MESSAGES/bison.mo
 file path=usr/share/locale/de/LC_MESSAGES/bison.mo
+file path=usr/share/locale/el/LC_MESSAGES/bison.mo
+file path=usr/share/locale/eo/LC_MESSAGES/bison.mo
 file path=usr/share/locale/es/LC_MESSAGES/bison.mo
 file path=usr/share/locale/et/LC_MESSAGES/bison.mo
+file path=usr/share/locale/fi/LC_MESSAGES/bison.mo
 file path=usr/share/locale/fr/LC_MESSAGES/bison.mo
 file path=usr/share/locale/ga/LC_MESSAGES/bison.mo
 file path=usr/share/locale/hr/LC_MESSAGES/bison.mo
@@ -64,17 +95,22 @@
 file path=usr/share/locale/nb/LC_MESSAGES/bison.mo
 file path=usr/share/locale/nl/LC_MESSAGES/bison.mo
 file path=usr/share/locale/pl/LC_MESSAGES/bison.mo
+file path=usr/share/locale/pt/LC_MESSAGES/bison.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/bison.mo
 file path=usr/share/locale/ro/LC_MESSAGES/bison.mo
 file path=usr/share/locale/ru/LC_MESSAGES/bison.mo
-file path=usr/share/locale/rw/LC_MESSAGES/bison.mo
+file path=usr/share/locale/sr/LC_MESSAGES/bison.mo
 file path=usr/share/locale/sv/LC_MESSAGES/bison.mo
 file path=usr/share/locale/tr/LC_MESSAGES/bison.mo
+file path=usr/share/locale/uk/LC_MESSAGES/bison.mo
 file path=usr/share/locale/vi/LC_MESSAGES/bison.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/bison.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/bison.mo
 file path=usr/share/man/man1/bison.1
 legacy pkg=SUNWbison desc="GNU bison - A YACC Replacement" \
     name="bison - A YACC Replacement"
 
 
-license bison.license license="GPLv2, FDLv1.2"
+license bison.license license="GPLv3, FDLv1.3"
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gm4
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/lib/liby.so.1