diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 543e3a012..af9ec0a72 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="4.1.3.1"
-          android:versionCode="269">
+          android:versionName="4.2.0"
+          android:versionCode="270">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 45bc9240d..c546fe6a9 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -41,6 +41,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V4_2_0 = 270;
     public static final int V4_1_3_1 = 269;
     public static final int V4_1_3 = 268;
     public static final int V4_1_2 = 267;
@@ -203,6 +204,14 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
+        if (from < V4_2_0) {
+            newVersionString(changeLog, "4.2.0 (6/05/12)", new String[] {
+                "Support for the Nook",
+                "Fixed crash on large image attachments",
+                "Minor bugfixes"
+            });
+        }
+
         if (from >= V4_1_3 && from < V4_1_3_1) {
             newVersionString(changeLog, "4.1.3.1 (5/18/12)", new String[] {
                 "Fixed reminders for ICS"