diff --git a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
index 5b7b0b0382f1fcc38432eb536b3ba4c8e2b3b19d..3748b6239f91ce1565f9a4d6858dc9b0cc63b67b 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
@@ -23,8 +23,10 @@ abstract class ExtensionHandler {
 
     private static final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(ExtensionHandler.class);
 
-    public static final int ID_METADATA = 3;
+    public static final int ID_METADATA = 1;
     private static final String TYPE_METADATA = "ut_metadata";
+    public static final int ID_PEX = 2;
+    private static final String TYPE_PEX = "ut_pex";
     /** Pieces * SHA1 Hash length, + 25% extra for file names, benconding overhead, etc */
     private static final int MAX_METADATA_SIZE = Storage.MAX_PIECES * 20 * 5 / 4;
     private static final int PARALLEL_REQUESTS = 3;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
index 18c9ad229face87ee5d1cec7e1d32bf6f1c99a0a..dd98e5dd92fb9befd65669dab48ae6816e34b45c 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java
@@ -79,6 +79,7 @@ public class Peer implements Comparable
   static final long OPTION_EXTENSION = 0x0000000000100000l;
   static final long OPTION_FAST      = 0x0000000000000004l;
   static final long OPTION_DHT       = 0x0000000000000001l;
+  static final long OPTION_AZMP      = 0x1000000000000000l;
   private long options;
 
   /**