--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/firefox/firefox-java.p5m	Fri Oct 14 02:29:24 2016 -0700
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/web/browser/firefox/plugin/firefox-java@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Java runtime integration - Firefox plugin"
+set name=com.oracle.info.description \
+    value="Java runtime integration - Firefox plugin"
+set name=org.opensolaris.arc-caseid value=PSARC/2014/085
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/Plug-ins and Run-times"
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/lib/firefox/browser/plugins/libnpjp2.so \
+    target=../../../../jdk/instances/jdk1.7.0/jre/lib/$(MACH)/libnpjp2.so
+legacy pkg=SUNWjre-config-plugin desc="Java runtime integration - plugin" \
+    name="Java runtime integration - plugin"
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/firefox/firefox
+depend type=require fmri=pkg:/runtime/java/jre-7

--- a/components/meta-packages/incorporation-cache	Fri Oct 14 08:02:40 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Fri Oct 14 02:29:24 2016 -0700
@@ -277,5 +277,4 @@
 consolidation/desktop/desktop-incorporation:text/[email protected]
 consolidation/desktop/desktop-incorporation:text/[email protected]
 consolidation/desktop/desktop-incorporation:web/browser/firefox/[email protected]
-consolidation/desktop/desktop-incorporation:web/browser/firefox/plugin/[email protected]
 consolidation/desktop/desktop-incorporation:web/editor/[email protected]