diff --git a/api/graphics_api.C b/api/graphics_api.C
index 8950224de4..49b2e7e076 100755
--- a/api/graphics_api.C
+++ b/api/graphics_api.C
@@ -156,6 +156,14 @@ int boinc_init_graphics(void (*_worker_main)()) {
     return 0;
 }
 
+#ifdef _PTHREAD_H
+extern "C" {
+void glut_quit() {
+    pthread_exit(0);
+}
+}
+#endif
+
 int boinc_finish_graphics() {
 #ifdef _WIN32
     if (graphics_inited) {
diff --git a/checkin_notes b/checkin_notes
index 64e39e2bfa..e7242a092a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -18482,3 +18482,14 @@ David  16 Oct 2004
             create_account_form.php
             team_join_action.php
             team_join_form.php
+
+David  17 Oct 2004
+    - Deal with fatal GLUT errors (e.g. can't connect to X server)
+        by calling glut_quit() (which exits the pthread)
+        rather than exit() or abort() (which exits the app)
+
+    api/
+        graphics_api.C
+    boincglut/lib/glut/
+        glut_util.C
+        README (new)