diff --git a/build.xml b/build.xml
index 5118b5b50..1b4d7643b 100644
--- a/build.xml
+++ b/build.xml
@@ -245,6 +245,7 @@
     <!-- generate services with an actionscript counterpart-->
     <genservice header="lib/SOURCE_HEADER" asroot="src/as" classpathref="built.classpath">
       <fileset dir="${src.dir}" includes="**/*Service.java">
+        <exclude name="**/RegistrationService.java"/>
         <exclude name="**/InvocationService.java"/>
         <exclude name="**/peer/**"/>
         <exclude name="**/admin/**"/>
@@ -255,9 +256,14 @@
     </genservice>
     <!-- generate java-only services -->
     <genservice header="lib/SOURCE_HEADER" classpathref="built.classpath">
+      <fileset dir="${src.dir}" includes="**/RegistrationService.java"/>
       <fileset dir="${src.dir}" includes="**/peer/**/*Service.java"/>
-      <fileset dir="${src.dir}" includes="**/admin/**/*Service.java"/>
+      <fileset dir="${src.dir}" includes="**/admin/**/*Service.java"
+          excludes="**/gwt/ConfigService.java"/>
     </genservice>
+    <gencppservice classpathref="built.classpath" cpproot="src/cpp">
+        <fileset dir="${src.dir}" includes="**/RegistrationService.java"/>
+    </gencppservice>
   </target>
 
   <target name="genreceiver" depends="-preptools"
diff --git a/src/main/java/com/threerings/presents/client/RegistrationService.java b/src/main/java/com/threerings/presents/client/RegistrationService.java
new file mode 100644
index 000000000..753a0c2ab
--- /dev/null
+++ b/src/main/java/com/threerings/presents/client/RegistrationService.java
@@ -0,0 +1,13 @@
+package com.threerings.presents.client;
+
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationReceiver.Registration;
+
+/**
+ * Adds a receiver registration for a client that doesn't use DObject and thereby can't
+ * use the registration set on ClientObject.
+ */
+public interface RegistrationService
+{
+    void registerReceiver(Client client, Registration registration);
+}
diff --git a/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java b/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java
new file mode 100644
index 000000000..57c06a387
--- /dev/null
+++ b/src/main/java/com/threerings/presents/data/RegistrationMarshaller.java
@@ -0,0 +1,31 @@
+package com.threerings.presents.data;
+
+import javax.annotation.Generated;
+
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationReceiver;
+import com.threerings.presents.client.RegistrationService;
+
+/**
+ * Provides the implementation of the {@link RegistrationService} interface
+ * that marshalls the arguments and delivers the request to the provider
+ * on the server. Also provides an implementation of the response listener
+ * interfaces that marshall the response arguments and deliver them back
+ * to the requesting client.
+ */
+@Generated(value={"com.threerings.presents.tools.cpp.GenCPPServiceTask"},
+           comments="Derived from RegistrationService.java.")
+public class RegistrationMarshaller extends InvocationMarshaller
+    implements RegistrationService
+{
+    /** The method id used to dispatch {@link #registerReceiver} requests. */
+    public static final int REGISTER_RECEIVER = 1;
+
+    // from interface RegistrationService
+    public void registerReceiver (Client arg1, InvocationReceiver.Registration arg2)
+    {
+        sendRequest(arg1, REGISTER_RECEIVER, new Object[] {
+            arg2
+        });
+    }
+}
diff --git a/src/main/java/com/threerings/presents/server/RegistrationDispatcher.java b/src/main/java/com/threerings/presents/server/RegistrationDispatcher.java
new file mode 100644
index 000000000..f97150174
--- /dev/null
+++ b/src/main/java/com/threerings/presents/server/RegistrationDispatcher.java
@@ -0,0 +1,48 @@
+package com.threerings.presents.server;
+
+import javax.annotation.Generated;
+
+import com.threerings.presents.client.InvocationReceiver;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.data.RegistrationMarshaller;
+
+/**
+ * Dispatches requests to the {@link RegistrationProvider}.
+ */
+@Generated(value={"com.threerings.presents.tools.cpp.GenCPPServiceTask"},
+           comments="Derived from RegistrationService.java.")
+public class RegistrationDispatcher extends InvocationDispatcher<RegistrationMarshaller>
+{
+    /**
+     * Creates a dispatcher that may be registered to dispatch invocation
+     * service requests for the specified provider.
+     */
+    public RegistrationDispatcher (RegistrationProvider provider)
+    {
+        this.provider = provider;
+    }
+
+    @Override
+    public RegistrationMarshaller createMarshaller ()
+    {
+        return new RegistrationMarshaller();
+    }
+
+    @Override
+    public void dispatchRequest (
+        ClientObject source, int methodId, Object[] args)
+        throws InvocationException
+    {
+        switch (methodId) {
+        case RegistrationMarshaller.REGISTER_RECEIVER:
+            ((RegistrationProvider)provider).registerReceiver(
+                source, (InvocationReceiver.Registration)args[0]
+            );
+            return;
+
+        default:
+            super.dispatchRequest(source, methodId, args);
+            return;
+        }
+    }
+}
diff --git a/src/main/java/com/threerings/presents/server/RegistrationProvider.java b/src/main/java/com/threerings/presents/server/RegistrationProvider.java
new file mode 100644
index 000000000..e81474ba2
--- /dev/null
+++ b/src/main/java/com/threerings/presents/server/RegistrationProvider.java
@@ -0,0 +1,20 @@
+package com.threerings.presents.server;
+
+import javax.annotation.Generated;
+
+import com.threerings.presents.client.InvocationReceiver;
+import com.threerings.presents.client.RegistrationService;
+import com.threerings.presents.data.ClientObject;
+
+/**
+ * Defines the server-side of the {@link RegistrationService}.
+ */
+@Generated(value={"com.threerings.presents.tools.cpp.GenCPPServiceTask"},
+           comments="Derived from RegistrationService.java.")
+public interface RegistrationProvider extends InvocationProvider
+{
+    /**
+     * Handles a {@link RegistrationService#registerReceiver} request.
+     */
+    void registerReceiver (ClientObject caller, InvocationReceiver.Registration arg1);
+}
diff --git a/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java b/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
index c2b3e06f6..c2a1eefbd 100644
--- a/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
+++ b/src/main/java/com/threerings/presents/tools/cpp/GenCPPReceiverTask.java
@@ -76,7 +76,7 @@ public class GenCPPReceiverTask extends GenReceiverTask
     protected static final String RECEIVER_HEADER_TMPL =
         "com/threerings/presents/tools/cpp/receiver_h.mustache";
     protected static final String DECODER_HEADER_TMPL =
-        "com/threerings/corpse/tools/decoder_h.mustache";
+        "com/threerings/presents/tools/cpp/decoder_h.mustache";
     protected static final String DECODER_CPP_TMPL =
         "com/threerings/presents/tools/cpp/decoder_cpp.mustache";
 }