diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBuffer.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBuffer.java
index 9d553ba..9e3b428 100644
--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBuffer.java
+++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/MessageBuffer.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-public interface MessageBuffer {
+public interface MessageBuffer<B, MB extends MessageBuffer> extends PBMessage<B, MB> {
    
     public int serializedSizeUnframed();
     
diff --git a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
index 85024f7..fd1f433 100644
--- a/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
+++ b/activemq-protobuf/src/main/java/org/apache/activemq/protobuf/compiler/AltJavaGenerator.java
@@ -359,7 +359,7 @@
         p("}");
         p();
 
-        p("static public final class "+bufferClassName+" implements org.apache.activemq.protobuf.MessageBuffer, "+className+" {");
+        p("static public final class "+bufferClassName+" implements org.apache.activemq.protobuf.MessageBuffer<"+className+"."+beanClassName+", "+className+"."+bufferClassName+">, "+className+" {");
         p();
         indent();