--- a/components/openvswitch/openvswitch.p5m	Mon Sep 19 12:40:42 2016 -0500
+++ b/components/openvswitch/openvswitch.p5m	Wed Sep 21 09:12:42 2016 -0700
@@ -41,24 +41,30 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2015/311
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file ovs.user_attr path=etc/security/auth_attr.d/application:openswitch:ovs \
+file ovs.auth_attr path=etc/security/auth_attr.d/application:openswitch:ovs \
     group=sys
 file ovs.exec_attr path=etc/security/exec_attr.d/application:openswitch:ovs \
     group=sys
 file ovs.prof_attr path=etc/security/prof_attr.d/application:openswitch:ovs \
     group=sys
 file ovs.user_attr path=etc/user_attr.d/application:openswitch:ovs group=sys
-file ovsdb.xml path=lib/svc/manifest/application/openvswitch/ovsdb.xml group=sys
+file ovsdb.xml path=lib/svc/manifest/application/openvswitch/ovsdb.xml \
+    group=sys disable_fmri=svc:/application/openvswitch/ovsdb-server:default
+
 # The following pkg.depend.bypass-generate is needed because the vswitch
 # service depends upon the ovsdb service. pkgdepend fails to find the file
 # containing the ovsdb service (since ovsdb.xml is under
 #  $(COMPONENT_DIR)/files) and fails.
 file vswitch.xml path=lib/svc/manifest/application/openvswitch/vswitch.xml \
-    group=sys pkg.depend.bypass-generate=.*
+    group=sys \
+    disable_fmri=svc:/application/openvswitch/vswitch-server:default \
+    pkg.depend.bypass-generate=.*
 file ovs-svc path=lib/svc/method/ovs-svc mode=0555
 file ovs-clean.py path=usr/lib/ovs/ovs-clean.py mode=0555
-file path=usr/lib/ovs/ovs-vswitchd mode=0555
-file path=usr/lib/ovs/ovsdb-server mode=0555
+file path=usr/lib/ovs/ovs-vswitchd mode=0555 \
+    suspend_fmri=svc:/application/openvswitch/vswitch-server:default
+file path=usr/lib/ovs/ovsdb-server mode=0555 \
+    suspend_fmri=svc:/application/openvswitch/ovsdb-server:default
 file usr/lib/ovs/share/openvswitch/vswitch.ovsschema \
     path=usr/lib/ovs/share/vswitch.ovsschema
 file tests/test-controller path=usr/lib/ovs/tests/test-controller mode=0555 \