diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
index 6a5bf7fa3..043baba68 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
@@ -391,7 +391,11 @@ class SAMv3Handler extends SAMv1Handler
 				} else if (domain.equals("NAMING")) {
 					canContinue = execNamingMessage(opcode, props);
 				} else if (domain.equals("DATAGRAM")) {
+					// TODO not yet overridden, ID is ignored, most recent DATAGRAM session is used
 					canContinue = execDatagramMessage(opcode, props);
+				} else if (domain.equals("RAW")) {
+					// TODO not yet overridden, ID is ignored, most recent RAW session is used
+					canContinue = execRawMessage(opcode, props);
 				} else {
 					if (_log.shouldLog(Log.DEBUG))
 						_log.debug("Unrecognized message domain: \""
@@ -694,10 +698,10 @@ class SAMv3Handler extends SAMv1Handler
 		else
 		{
 			if (_log.shouldLog(Log.DEBUG))
-				_log.debug ( "Unrecognized RAW message opcode: \""
+				_log.debug ( "Unrecognized STREAM message opcode: \""
 					+ opcode + "\"" );
 			try {
-				notifyStreamResult(true, "I2P_ERROR",  "Unrecognized RAW message opcode: "+opcode );
+				notifyStreamResult(true, "I2P_ERROR",  "Unrecognized STREAM message opcode: "+opcode );
 			} catch (IOException e) {}
 			return false;
 		}
@@ -716,9 +720,9 @@ class SAMv3Handler extends SAMv1Handler
 		
 			String dest = props.getProperty("DESTINATION");
 			if (dest == null) {
-				notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in RAW SEND message");
+				notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in STREAM CONNECT message");
 				if (_log.shouldLog(Log.DEBUG))
-					_log.debug("Destination not specified in RAW SEND message");
+					_log.debug("Destination not specified in STREAM CONNECT message");
 				return false;
 			}
 			props.remove("DESTINATION");
diff --git a/history.txt b/history.txt
index dc1b1f86e..cb73fe89f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,7 @@
 2014-07-19 zzz
  * i2psnark: Don't prefer leeches during end game, to
    prevent slowdowns or stalls
+ * SAM: Add support for RAW on the bridge socket in v3 (ticket #1334)
  * Streaming; Disable fail-fast for now.
 
 2014-07-15 str4d
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e1f87e077..8ab24107c 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 16;
+    public final static long BUILD = 17;
 
     /** for example "-test" */
     public final static String EXTRA = "";