diff --git a/api/net/sf/briar/api/protocol/Tags.java b/api/net/sf/briar/api/protocol/Tags.java
index 60b3be884a0d700b3021e00e3613cdfa414eb577..77ca61c57c0aef105a4b2c7d5e6d7c16ae115ddc 100644
--- a/api/net/sf/briar/api/protocol/Tags.java
+++ b/api/net/sf/briar/api/protocol/Tags.java
@@ -17,9 +17,8 @@ public interface Tags {
 	static final int MESSAGE = 7;
 	static final int MESSAGE_ID = 8;
 	static final int OFFER = 9;
-	// FIXME: Renumber
-	static final int REQUEST = 11;
-	static final int SUBSCRIPTION_UPDATE = 12;
-	static final int TRANSPORT_PROPERTIES = 13;
-	static final int TRANSPORT_UPDATE = 14;
+	static final int REQUEST = 10;
+	static final int SUBSCRIPTION_UPDATE = 11;
+	static final int TRANSPORT_PROPERTIES = 12;
+	static final int TRANSPORT_UPDATE = 13;
 }
diff --git a/test/net/sf/briar/protocol/writers/RequestWriterImplTest.java b/test/net/sf/briar/protocol/writers/RequestWriterImplTest.java
index c9a5f178fee289eaa3df84b50d40dc73e1adc384..e017074d3ea52841cb25e35d8cba5dd6da21f803 100644
--- a/test/net/sf/briar/protocol/writers/RequestWriterImplTest.java
+++ b/test/net/sf/briar/protocol/writers/RequestWriterImplTest.java
@@ -42,9 +42,9 @@ public class RequestWriterImplTest extends TestCase {
 		b.set(12);
 		b.set(15);
 		r.writeRequest(b, 16);
-		// Short user tag 11, short bytes with length 2, 0xD959
+		// Short user tag 10, short bytes with length 2, 0xD959
 		byte[] output = out.toByteArray();
-		assertEquals("CB" + "92" + "D959", StringUtils.toHexString(output));
+		assertEquals("CA" + "92" + "D959", StringUtils.toHexString(output));
 	}
 
 	@Test
@@ -63,8 +63,8 @@ public class RequestWriterImplTest extends TestCase {
 		b.set(11);
 		b.set(12);
 		r.writeRequest(b, 13);
-		// Short user tag 11, short bytes with length 2, 0x59D8
+		// Short user tag 10, short bytes with length 2, 0x59D8
 		byte[] output = out.toByteArray();
-		assertEquals("CB" + "92" + "59D8", StringUtils.toHexString(output));
+		assertEquals("CA" + "92" + "59D8", StringUtils.toHexString(output));
 	}
 }