diff --git a/checkin_notes b/checkin_notes
index 55f7f727b3..6241453921 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8499,3 +8499,10 @@ David  21 Oct 2008
             profile_screen_action.php
         project.sample/
             project.inc
+
+David  21 Oct 2008
+    - web: if user tries to edit a BOINC-wide team,
+        warn them that changes will get overwritten.
+
+    html/inc/
+        team.inc
diff --git a/html/inc/team.inc b/html/inc/team.inc
index b230176ec6..7b91ec515e 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -387,6 +387,15 @@ function team_edit_form($team, $label, $url) {
     if ($team) {
         echo "<input type=hidden name=teamid value=$team->id>\n";
     }
+    if ($team->seti_id) {
+        echo "<p><span class=error>WARNING: this is a BOINC-wide team.
+            If you make changes here, they will soon be overwritten.
+            Edit the
+            <a href=http://boinc.berkeley.edu/teams/>BOINC-wide team</a>
+            instead.</span>
+            <p>
+        ";
+    }
     echo '
         <p>
         '.tra('%1Privacy note%2: if you create a team, your project preferences (resource share, graphics preferences) will be visible to the public.', '<b>', '</b>').'