diff --git a/client-websocket/pom.xml b/client-websocket/pom.xml
index 754ecdd37..e130e946a 100644
--- a/client-websocket/pom.xml
+++ b/client-websocket/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-client</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/client/pom.xml b/client/pom.xml
index c29a904ab..9b7f5a673 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-messaging</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index caf29cebf..9f77651c4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
  
 	<repositories>
diff --git a/messaging-target/pom.xml b/messaging-target/pom.xml
index 1f6b252eb..bcd9b2cb7 100644
--- a/messaging-target/pom.xml
+++ b/messaging-target/pom.xml
@@ -9,20 +9,20 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-messaging</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-client</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
diff --git a/messaging/pom.xml b/messaging/pom.xml
index 147ac62aa..425192e61 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-core</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index 5c9e995fe..e186dc8cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>xdi2</groupId>
 	<artifactId>xdi2</artifactId>
 	<packaging>pom</packaging>
-	<version>0.8-SNAPSHOT</version>
+	<version>0.8-M2</version>
 	<name>xdi2</name>
 	<description>XDI2 (XDI Two) is a general-purpose, lightweight and modular Java implementation of XDI specifications.</description>
 	<url>https://xdi2.org</url>
diff --git a/rdf/pom.xml b/rdf/pom.xml
index 720e82bb9..470db99c8 100644
--- a/rdf/pom.xml
+++ b/rdf/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-core</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/server-standalone/pom.xml b/server-standalone/pom.xml
index 48de5ac1c..fe1b3a2f7 100644
--- a/server-standalone/pom.xml
+++ b/server-standalone/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<build>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-server</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/server-war/pom.xml b/server-war/pom.xml
index 5f8d903a1..13fc955ae 100644
--- a/server-war/pom.xml
+++ b/server-war/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<build>
@@ -139,7 +139,7 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-server</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/server/pom.xml b/server/pom.xml
index 52740ce91..b4596a8d4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
@@ -17,19 +17,19 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-http</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-websocket</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-local</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/transport-http/pom.xml b/transport-http/pom.xml
index b63217c74..c9fc668d5 100644
--- a/transport-http/pom.xml
+++ b/transport-http/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-uri</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/transport-local/pom.xml b/transport-local/pom.xml
index e06773178..6dad836ad 100644
--- a/transport-local/pom.xml
+++ b/transport-local/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
diff --git a/transport-uri/pom.xml b/transport-uri/pom.xml
index 48feb1416..98f781e0e 100644
--- a/transport-uri/pom.xml
+++ b/transport-uri/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
diff --git a/transport-websocket/pom.xml b/transport-websocket/pom.xml
index e29136d51..923a1ac35 100644
--- a/transport-websocket/pom.xml
+++ b/transport-websocket/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<dependencies>
@@ -28,13 +28,13 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-uri</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-client-websocket</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
diff --git a/transport/pom.xml b/transport/pom.xml
index 00a62110d..1e0e613aa 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<build>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-messaging-target</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/webtools/pom.xml b/webtools/pom.xml
index bc0ce2384..0736aa4e6 100644
--- a/webtools/pom.xml
+++ b/webtools/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>xdi2</groupId>
 		<artifactId>xdi2</artifactId>
-		<version>0.8-SNAPSHOT</version>
+		<version>0.8-M2</version>
 	</parent>
 
 	<build>
@@ -145,25 +145,25 @@
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-client</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-server</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-transport-local</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>xdi2</groupId>
 			<artifactId>xdi2-rdf</artifactId>
-			<version>0.8-SNAPSHOT</version>
+			<version>0.8-M2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>