diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 6de167651..bd4f0785b 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="3.6.4"
-          android:versionCode="170">
+          android:versionName="3.7.0-prerelease"
+          android:versionCode="171">
           
   <!-- 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 58849d39c..211509f1b 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -22,6 +22,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V3_7_0 = 171;
     public static final int V3_6_4 = 170;
     public static final int V3_6_3 = 169;
     public static final int V3_6_2 = 168;
@@ -118,13 +119,16 @@ public final class UpgradeService {
             });
         } else {
             // current message
+            if(from < V3_7_0) {
+                upgrade3To3_7();
+            }
+
+            // old messages
             if(from >= V3_6_0 && from < V3_6_4) {
                 newVersionString(changeLog, "3.6.4 (12/28/10)", new String[] {
                         "Fix crash occuring when using timers",
                 });
             }
-
-            // old messages
             if(from >= V3_6_0 && from < V3_6_3) {
                 newVersionString(changeLog, "3.6.3 (12/18/10)", new String[] {
                         "Added support for Producteev repeating tasks",
@@ -219,7 +223,7 @@ public final class UpgradeService {
     /**
      * Fixes task filter missing tasks bug
      */
-    private void upgrade3To3_7(final Context context) {
+    private void upgrade3To3_7() {
         TodorooCursor<Task> t = taskService.query(Query.select(Task.ID, Task.DUE_DATE).where(Task.DUE_DATE.gt(0)));
         Task task = new Task();
         for(t.moveToFirst(); !t.isAfterLast(); t.moveToNext()) {