--- a/components/flex/flexruntime.p5m	Tue May 31 06:27:16 2016 -0700
+++ b/components/flex/flexruntime.p5m	Tue May 31 11:48:20 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -30,15 +30,20 @@
     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/2016/309
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/lib/$(MACH64)/libfl-2.5.4.so.0 target=./libfl.so.1
-link path=usr/lib/$(MACH64)/libfl.so target=./libfl.so.1
-file path=usr/lib/$(MACH64)/libfl.so.1
-link path=usr/lib/libfl-2.5.4.so target=./libfl.so.1
-link path=usr/lib/libfl.so target=./libfl.so.1
-file path=usr/lib/libfl.so.1
-legacy pkg=SUNWflexruntime \
-    desc="The Flex Lexer - A lex replacement/substitute runtime" \
-    name="Flex Lexer"
-license flex.license license=BSD
+link path=usr/lib/$(MACH64)/libfl.so target=libfl.so.2.0.0
+link path=usr/lib/$(MACH64)/libfl.so.1 target=libfl.so.2.0.0
+link path=usr/lib/$(MACH64)/libfl.so.2 target=libfl.so.2.0.0
+file path=usr/lib/$(MACH64)/libfl.so.2.0.0
+link path=usr/lib/$(MACH64)/libfl_pic.so target=libfl_pic.so.2.0.0
+link path=usr/lib/$(MACH64)/libfl_pic.so.2 target=libfl_pic.so.2.0.0
+file path=usr/lib/$(MACH64)/libfl_pic.so.2.0.0
+link path=usr/lib/libfl.so target=libfl.so.2.0.0
+link path=usr/lib/libfl.so.1 target=libfl.so.2.0.0
+link path=usr/lib/libfl.so.2 target=libfl.so.2.0.0
+file path=usr/lib/libfl.so.2.0.0
+link path=usr/lib/libfl_pic.so target=libfl_pic.so.2.0.0
+link path=usr/lib/libfl_pic.so.2 target=libfl_pic.so.2.0.0
+file path=usr/lib/libfl_pic.so.2.0.0
+license COPYING license=BSD