Index: ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(revision 87401)
+++ ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(working copy)
@@ -269,30 +269,30 @@
 
   <!-- SLSB JNDI Registrar -->
   <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+    class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatelessSessionRegistrar">
     <constructor>
       <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+        org.jboss.ejb3.proxy.impl.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
       </parameter>
     </constructor>
   </bean>
 
   <!-- SFSB JNDI Registrar -->
   <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+    class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatefulSessionRegistrar">
     <constructor>
       <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+        org.jboss.ejb3.proxy.impl.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
       </parameter>
     </constructor>
   </bean>  
   
   <!-- @Service JNDI Registrar -->
   <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiServiceRegistrar">
+    class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiServiceRegistrar">
     <constructor>
       <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.service.ServiceProxyObjectFactory
+        org.jboss.ejb3.proxy.impl.objectfactory.session.service.ServiceProxyObjectFactory
       </parameter>
     </constructor>
   </bean>
Index: ejb3/build.xml
===================================================================
--- ejb3/build.xml	(revision 87401)
+++ ejb3/build.xml	(working copy)
@@ -120,7 +120,8 @@
          <path refid="jboss.jboss.ejb3.ext.api.impl.classpath" />
          <path refid="jboss.jboss.ejb3.interceptors.classpath" />
          <path refid="jboss.jboss.ejb3.metadata.classpath" />
-         <path refid="jboss.jboss.ejb3.proxy.classpath" />
+         <path refid="jboss.jboss.ejb3.proxy.impl.classpath" />
+         <path refid="jboss.jboss.ejb3.proxy.spi.classpath" />
          <path refid="jboss.jboss.ejb3.timerservice.spi.classpath" />
          <path refid="jboss.jboss.jpa.deployers.classpath"/>
          <path refid="jboss.jboss.mdr.classpath"/>
Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml	(revision 87401)
+++ thirdparty/pom.xml	(working copy)
@@ -31,6 +31,8 @@
                 <bannedDependencies>
                   <excludes>
                     <exclude>org.jboss.jbossas:*</exclude>
+                    <!-- JBAS-6798, is now jboss-ejb3-proxy-spi and jboss-ejb3-proxy-impl -->
+                    <exclude>org.jboss.ejb3:jboss-ejb3-proxy</exclude>
                   </excludes>
                   <includes>
                     <include>org.jboss.jbossas:jboss-server-manager</include>
@@ -540,22 +542,38 @@
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
-              <artifactId>jboss-ejb3-proxy</artifactId>
+              <artifactId>jboss-ejb3-proxy-impl</artifactId>
               <mapping>
-                <componentId>jboss.jboss-ejb3-proxy</componentId>
+                <componentId>jboss.jboss-ejb3-proxy-impl</componentId>
               </mapping>
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
-              <artifactId>jboss-ejb3-proxy</artifactId>
+              <artifactId>jboss-ejb3-proxy-impl</artifactId>
               <classifier>client</classifier>
               <mapping>
-                <componentId>jboss.jboss-ejb3-proxy</componentId>
-                <artifactId>jboss-ejb3-proxy-client</artifactId>
+                <componentId>jboss.jboss-ejb3-proxy-impl</componentId>
+                <artifactId>jboss-ejb3-proxy-impl-client</artifactId>
               </mapping>
             </dependency>
             <dependency>
               <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-proxy-spi</artifactId>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-proxy-spi</componentId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
+              <artifactId>jboss-ejb3-proxy-spi</artifactId>
+              <classifier>client</classifier>
+              <mapping>
+                <componentId>jboss.jboss-ejb3-proxy-spi</componentId>
+                <artifactId>jboss-ejb3-proxy-spi-client</artifactId>
+              </mapping>
+            </dependency>
+            <dependency>
+              <groupId>org.jboss.ejb3</groupId>
               <artifactId>jboss-ejb3-proxy-clustered</artifactId>
               <mapping>
                 <componentId>jboss.jboss-ejb3-proxy-clustered</componentId>
@@ -1394,6 +1412,13 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-as-int</artifactId>
+      <!--JBAS-6798 May be removed after jboss-ejb3 is 1.1.5-->
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.ejb3</groupId>
+          <artifactId>jboss-ejb3-proxy</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
@@ -1402,11 +1427,16 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-proxy</artifactId>
+      <artifactId>jboss-ejb3-proxy-impl</artifactId>
       <classifier>client</classifier>
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy-spi</artifactId>
+      <classifier>client</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-proxy-clustered</artifactId>
       <classifier>client</classifier>
     </dependency>
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml	(revision 87401)
+++ component-matrix/pom.xml	(working copy)
@@ -65,7 +65,8 @@
     <version.org.jboss.deployers>2.2.0.M1</version.org.jboss.deployers>
     <version.org.jboss.ejb3.common.client>1.0.0</version.org.jboss.ejb3.common.client>
     <version.org.jboss.ejb3.core.client>1.1.4</version.org.jboss.ejb3.core.client>
-    <version.org.jboss.ejb3.proxy.client>1.0.1</version.org.jboss.ejb3.proxy.client>
+    <version.org.jboss.ejb3.proxy.impl.client>1.0.2</version.org.jboss.ejb3.proxy.impl.client>
+    <version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.1</version.org.jboss.ejb3.proxy.clustered.client>
     <version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
     <version.org.jboss.ejb3>1.1.4</version.org.jboss.ejb3>
@@ -1729,10 +1730,17 @@
     
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
-        <artifactId>jboss-ejb3-proxy</artifactId>
-        <version>${version.org.jboss.ejb3.proxy.client}</version>
+        <artifactId>jboss-ejb3-proxy-impl</artifactId>
+        <version>${version.org.jboss.ejb3.proxy.impl.client}</version>
         <classifier>client</classifier>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.ejb3</groupId>
+        <artifactId>jboss-ejb3-proxy-spi</artifactId>
+        <version>${version.org.jboss.ejb3.proxy.spi.client}</version>
+        <classifier>client</classifier>
+      </dependency>
     
       <dependency>
         <groupId>org.jboss.ejb3</groupId>
Index: build/build-distr.xml
===================================================================
--- build/build-distr.xml	(revision 87401)
+++ build/build-distr.xml	(working copy)
@@ -168,8 +168,10 @@
                excludes="*-sources.jar, *-javadoc.jar"/>
       <fileset dir="${jboss.jboss.ejb3.mc.int.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
-      <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*.jar"
+      <fileset dir="${jboss.jboss.ejb3.proxy.impl.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.proxy.spi.lib}" includes="*.jar"
+                     excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
       <fileset dir="${jboss.jboss.ejb3.proxy.clustered.lib}" includes="*.jar"
                excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
       <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*.jar"
@@ -210,7 +212,8 @@
       <fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*-client.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*-client.jar" excludes="*sources.jar"/>
-      <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*-client.jar" excludes="*sources.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.proxy.impl.lib}" includes="*-client.jar" excludes="*sources.jar"/>
+      <fileset dir="${jboss.jboss.ejb3.proxy.spi.lib}" includes="*-client.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.proxy.clustered.lib}" includes="*-client.jar" excludes="*sources.jar"/>
       <fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*-client.jar" excludes="*sources.jar"/>
     </copy>