diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema.pm
index 2ca0abc1a09..c7d4a5583be 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema.pm
@@ -469,7 +469,8 @@ use constant ABSTRACT_SCHEMA => {
         FIELDS => [
             product_id => {TYPE => 'INT2', NOTNULL => 1},
             value      => {TYPE => 'varchar(20)', NOTNULL => 1},
-            sortkey    => {TYPE => 'INT2', NOTNULL => 1},
+            sortkey    => {TYPE => 'INT2', NOTNULL => 1,
+                           DEFAULT => 0},
         ],
         INDEXES => [
             milestones_product_id_idx => {FIELDS => [qw(product_id value)],
diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index 57981a63943..4cfc096e186 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -3960,6 +3960,11 @@ $dbh->bz_alter_column('versions', 'value',
 $dbh->bz_add_index('versions', 'versions_product_id_idx',
                    {TYPE => 'UNIQUE', FIELDS => [qw(product_id value)]});
 
+# Milestone sortkeys get a default just like all other sortkeys.
+if (!exists $dbh->bz_column_info('milestones', 'sortkey')->{DEFAULT}) {
+    $dbh->bz_alter_column('milestones', 'sortkey', 
+                          {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+}
 
 
 # If you had to change the --TABLE-- definition in any way, then add your