Index: ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(revision 80752)
+++ ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml	(working copy)
@@ -236,7 +236,7 @@
             <!-- ServiceRemoteProxyFactory -->
             <entry>
                <key>ServiceRemoteProxyFactory</key>
-               <value>org.jboss.ejb3.proxy.factory.service.ServiceRemoteProxyFactory</value>
+               <value>org.jboss.ejb3.proxy.factory.session.service.ServiceRemoteProxyFactory</value>
             </entry>
             <!-- StatefulClusterProxyFactory -->
             <entry>
@@ -351,6 +351,15 @@
     </constructor>
   </bean>
 
+  <!-- @Service JNDI Registrar -->
+  <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
+    class="org.jboss.ejb3.proxy.jndiregistrar.JndiServiceRegistrar">
+    <constructor>
+      <parameter>
+        org.jboss.ejb3.proxy.objectfactory.session.service.ServiceProxyObjectFactory
+      </parameter>
+    </constructor>
+  </bean>
 
   <!-- EJB3 ProcessorChain Deployer -->
   <bean name="Ejb3MetadataProcessingDeployer" class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />