diff --git a/TODO b/TODO
deleted file mode 100644
index 43167c610..000000000
--- a/TODO
+++ /dev/null
@@ -1,31 +0,0 @@
-Here is a brief list of things that still need to be done.
-
-API:
-   - Reorganize the package layout to be more modular.
-   - Support multiple active wallets.
-
-Protocol:
-   - Start up faster
-      - Store a block locator in the persisted chain
-      - Use the getheaders command to speed up the initial chain download
-   - Implement tx fees.
-   - Longer term potentially add a getmerklebranch protocol command so we can check 0-confirmation transactions.
-
-Examples/documentation:
-   - Implement a simple Swing GUI payment app.
-
-Cleanup:
-   - Find a way to avoid some horrid hacks when shutting down the network connection.
-   - Implement a BitCoin class that encapsulates a BigInteger and formatting.
-   - Make NetworkParameters use subclasses instead of static methods to construct.
-
-==========
-
-Impacts from Steves changes:
-- LazyParseByteCacheTest:
-   - some redundant asserts
-   - huge functions
-
-- Delete the code related to deduping. The new network management code to be checked in later makes it unnecessary.
-  Also remove singleDigest as a result (it duplicates Sha256Hash).
-- More thoroughly review UnsafeByteArrayOutputStream
diff --git a/pom.xml b/pom.xml
index 3ebf68af6..3dca4791c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google</groupId>
   <artifactId>bitcoinj</artifactId>
-  <version>0.4-SNAPSHOT</version>
+  <version>0.4</version>
   <name>BitCoinJ</name>
   <description>A Java implementation of a Bitcoin client-only node</description>
   <url>http://code.google.com/p/bitcoinj</url>
@@ -32,10 +32,6 @@
       <name>Miron Cuperman</name>
       <email>miron@google.com</email>
     </developer>
-    <developer>
-      <name>Xiaofeng Guo</name>
-      <email>xiaofengguo@google.com</email>
-    </developer>
   </developers>
 
   <!-- Patchers and contributors -->
@@ -77,6 +73,18 @@
       <name>Steve Coughlan</name>
       <email>shadders.del@gmail.com</email>
     </contributor>
+    <contributor>
+      <name>Roman Mandeleil</name>
+      <email>roman.mandeleil@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Chris Rico</name>
+      <email>chrisrico@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Vasile Rotaru</name>
+      <email>vrotaru.md@gmail.com</email>
+    </contributor>
   </contributors>
 
   <issueManagement>
@@ -92,7 +100,7 @@
   </mailingLists>
 
   <scm>
-    <url>http://bitcoinj.googlecode.com/svn/trunk/</url>
+    <url>http://code.google.com/p/bitcoinj/source/checkout</url>
   </scm>
 
   <distributionManagement>
@@ -262,6 +270,22 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.1.2</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+      </plugin>
+
 <!--
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/src/com/google/bitcoin/core/VersionMessage.java b/src/com/google/bitcoin/core/VersionMessage.java
index 2ea8433bb..d9fad1236 100644
--- a/src/com/google/bitcoin/core/VersionMessage.java
+++ b/src/com/google/bitcoin/core/VersionMessage.java
@@ -92,7 +92,7 @@ public class VersionMessage extends Message {
         } catch (UnknownHostException e) {
             throw new RuntimeException(e);  // Cannot happen (illegal IP length).
         }
-        subVer = "/BitCoinJ:0.4-SNAPSHOT/";
+        subVer = "/BitCoinJ:0.4/";
         bestHeight = newBestHeight;
 
         length = 84;