Index: appserver/packager/glassfish-common-web/pom.xml
===================================================================
--- appserver/packager/glassfish-common-web/pom.xml	(revision 61580)
+++ appserver/packager/glassfish-common-web/pom.xml	(working copy)
@@ -195,6 +195,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.main.orb</groupId>
+            <artifactId>orb-enabler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.ha</groupId>
             <artifactId>ha-api</artifactId>
         </dependency>    
Index: appserver/appclient/server/core/pom.xml
===================================================================
--- appserver/appclient/server/core/pom.xml	(revision 61580)
+++ appserver/appclient/server/core/pom.xml	(working copy)
@@ -140,6 +140,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.main.orb</groupId>
+            <artifactId>orb-enabler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.main.security</groupId>
             <artifactId>security-ee</artifactId>
             <version>${project.version}</version>
Index: appserver/orb/orb-enabler/pom.xml
===================================================================
--- appserver/orb/orb-enabler/pom.xml	(revision 61580)
+++ appserver/orb/orb-enabler/pom.xml	(working copy)
@@ -81,10 +81,5 @@
             <artifactId>kernel</artifactId>
             <version>${project.version}</version>
         </dependency>         
-    	<dependency>
-            <groupId>org.glassfish.main.orb</groupId>
-            <artifactId>orb-connector</artifactId>
-            <version>${project.version}</version>
-        </dependency>         
     </dependencies>
 </project>
Index: appserver/orb/orb-connector/pom.xml
===================================================================
--- appserver/orb/orb-connector/pom.xml	(revision 61580)
+++ appserver/orb/orb-connector/pom.xml	(working copy)
@@ -72,6 +72,11 @@
         </developer>
     </developers>
     <dependencies>
+    	<dependency>
+            <groupId>org.glassfish.main.orb</groupId>
+            <artifactId>orb-enabler</artifactId>
+            <version>${project.version}</version>
+        </dependency>         
         <dependency>
             <groupId>org.glassfish.main.admin</groupId>
             <artifactId>admin-util</artifactId>
Index: appserver/orb/orb-iiop/pom.xml
===================================================================
--- appserver/orb/orb-iiop/pom.xml	(revision 61580)
+++ appserver/orb/orb-iiop/pom.xml	(working copy)
@@ -119,6 +119,11 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.main.orb</groupId>
+            <artifactId>orb-enabler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.main.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.version}</version>
Index: appserver/security/ejb.security/pom.xml
===================================================================
--- appserver/security/ejb.security/pom.xml	(revision 61580)
+++ appserver/security/ejb.security/pom.xml	(working copy)
@@ -155,5 +155,10 @@
             <artifactId>orb-connector</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.orb</groupId>
+            <artifactId>orb-enabler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
Index: appserver/orb/orb-connector/osgi.bundle
===================================================================
--- appserver/orb/orb-connector/osgi.bundle	(revision 61580)
+++ appserver/orb/orb-connector/osgi.bundle	(working copy)
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2010-2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -40,7 +40,7 @@
 
 -exportcontents: \
     org.glassfish.enterprise.iiop.api; \
-    org.glassfish.orb.admin.config; \
+    org.glassfish.orb.admin.config.handler; \
     org.glassfish.enterprise.iiop.util; \
     org.glassfish.enterprise.iiop.spi; version=${project.osgi.version}