diff --git a/assembly.xml b/assembly.xml
index a01e461..93e321e 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -1,50 +1,64 @@
 <assembly>
-    <id>dist</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
+	<id>release</id>
+	<formats>
+		<format>zip</format>
+		<format>tar.gz</format>
+	</formats>
+	<includeBaseDirectory>true</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<lineEnding>unix</lineEnding>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<useStrictFiltering>false</useStrictFiltering>
+			<directory>${basedir}</directory>
+			<outputDirectory></outputDirectory>
+			<includes>
+				<include>*.xml</include>
+				<include>*.txt</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	<moduleSets>
+		<moduleSet>
+			<includes></includes>
+			<sources>
+ 				<fileSets>
+					<fileSet>
+						<directory>src</directory>
+						<outputDirectory>src</outputDirectory>
+						<lineEnding>unix</lineEnding>
+						<useDefaultExcludes>true</useDefaultExcludes>
+					</fileSet>
 
-    <files>
-        <file>
-            <source>pom.xml</source>
-        </file>
-    </files>
+					<fileSet>
+						<lineEnding>unix</lineEnding>
+						<useDefaultExcludes>true</useDefaultExcludes>
+						<includes>
+							<include>*.xml</include>
+						</includes>
+					</fileSet>
 
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                <include>org.jasig.cas:cas-client-core</include>
-                <include>org.jasig.cas:cas-client-uportal</include>
-            </includes>
+					<fileSet>
+						<lineEnding>unix</lineEnding>
+						<directory>target/site/apidocs/</directory>
+						<useDefaultExcludes>true</useDefaultExcludes>
+						<outputDirectory>docs</outputDirectory>
+						<includes>
+							<include>**/*</include>
+						</includes>
+					</fileSet>
+				</fileSets>
 
-            <sources>
-                <outputDirectory>${artifactId}</outputDirectory>
-                <includes>
-                    <directory>src</directory>
-                    <include>README*</include>
-                    <include>LICENSE*</include>
-                    <include>NOTICE*</include>
-                    <include>pom.xml</include>
-                </includes>
-            </sources>
-            <binaries>
-                <outputDirectory>bin</outputDirectory>
-                <includeDependencies>true</includeDependencies>
-                <unpack>false</unpack>
-                <includes>
-                    <include>target/*.jar</include>
-                </includes>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <excludes>
-                <exclude>**/.*uportal.*.jar</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
+ 				<includeModuleDirectory>true</includeModuleDirectory>
+				<useDefaultExcludes>true</useDefaultExcludes>
+			</sources>
+			<binaries>
+				<outputDirectory>modules</outputDirectory>
+				<includeDependencies>true</includeDependencies>
+				<unpack>false</unpack>
+ 				<useDefaultExcludes>true</useDefaultExcludes>
+				<includes />
+			</binaries>
+		</moduleSet>
+	</moduleSets>
 </assembly>
\ No newline at end of file
diff --git a/cas-client-core/pom.xml b/cas-client-core/pom.xml
index d13e3dd..9cd3f10 100644
--- a/cas-client-core/pom.xml
+++ b/cas-client-core/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.jasig.cas</groupId>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.1-m1</version>
         <artifactId>cas-client</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
     <artifactId>cas-client-core</artifactId>
     <packaging>jar</packaging>
     <name>JA-SIG CAS Client for Java - Core</name>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1-m1</version>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/cas-client-uportal/pom.xml b/cas-client-uportal/pom.xml
index 9652972..ac18631 100644
--- a/cas-client-uportal/pom.xml
+++ b/cas-client-uportal/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jasig.cas</groupId>
         <artifactId>cas-client</artifactId>
-        <version>3.1-SNAPSHOT</version>
+        <version>3.1-m1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jasig.cas</groupId>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.jasig.cas</groupId>
             <artifactId>cas-client-core</artifactId>
-            <version>3.1-SNAPSHOT</version>
+            <version>3.1-m1</version>
         </dependency>
     </dependencies>
     <reporting>
diff --git a/pom.xml b/pom.xml
index 18b1512..5bcc9ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.jasig.cas</groupId>
-    <version>3.1-SNAPSHOT</version>
+    <version>3.1-m1</version>
     <artifactId>cas-client</artifactId>
     <packaging>pom</packaging>
     <name>JA-SIG CAS Client for Java</name>
@@ -77,13 +77,16 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <descriptor>assembly.xml</descriptor>
-                </configuration>
-            </plugin>
+			<plugin>
+        		<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+ 				<version>2.2-SNAPSHOT</version>
+				<configuration>
+					<descriptors>
+						<descriptor>${basedir}/assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
         </plugins>
     </build>