diff --git a/apps/i2psnark/java/src/org/klomp/snark/Message.java b/apps/i2psnark/java/src/org/klomp/snark/Message.java
index cdde79a18191f7c2c65dc064d2ec300c311e0c6e..a9d1e23f2532508d0f5a904d14f45253328e4497 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Message.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Message.java
@@ -39,7 +39,13 @@ class Message
   final static byte REQUEST      = 6;
   final static byte PIECE        = 7;
   final static byte CANCEL       = 8;
-  final static byte EXTENSION    = 20;
+  final static byte PORT         = 9;   // DHT  (BEP 5)
+  final static byte SUGGEST      = 13;  // Fast (BEP 6)
+  final static byte HAVE_ALL     = 14;  // Fast (BEP 6)
+  final static byte HAVE_NONE    = 15;  // Fast (BEP 6)
+  final static byte REJECT       = 16;  // Fast (BEP 6)
+  final static byte ALLOWED_FAST = 17;  // Fast (BEP 6)
+  final static byte EXTENSION    = 20;  // BEP 10
   
   // Not all fields are used for every message.
   // KEEP_ALIVE doesn't have a real wire representation
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index d921f12e82b1f87e190b87e1f5ad0e88f3663be5..ae053b8c8ac9d96a485256d7a5a3fece5560337a 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -63,6 +63,7 @@ public class Peer implements Comparable
   //  bytes per bt spec:                 0011223344556677
   static final long OPTION_EXTENSION = 0x0000000000100000l;
   static final long OPTION_FAST      = 0x0000000000000004l;
+  static final long OPTION_DHT       = 0x0000000000000001l;
   private long options;
 
   /**