diff --git a/checkin_notes b/checkin_notes
index 638d4503dc..b0a7440d81 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12113,3 +12113,11 @@ David  May 5 2004
         Makefile.am,in
     sched/
         Makefile.am,in
+
+Rom    May 5 2004
+    - Our exit stragety should be the same for Windows and Unix.  The signal
+      handler should use the same global flags as Windows for suspending
+      and resuming activities.
+
+    client/
+        main.C
diff --git a/client/main.C b/client/main.C
index 1b5db30a0f..322974d82f 100644
--- a/client/main.C
+++ b/client/main.C
@@ -198,22 +198,16 @@ static void signal_handler(int signum) {
     case SIGINT:
     case SIGQUIT:
     case SIGTERM:
-        msg_printf(NULL, MSG_INFO, "Exiting - user request");
-        gstate.quit_activities();
-        exit(0);
+        gstate.requested_exit = true;
+        break;
     case SIGTSTP:
-        msg_printf(NULL, MSG_INFO, "Suspending activity - user request");
-        gstate.active_tasks.suspend_all();
-        signal(SIGTSTP, SIG_DFL);
-        raise(SIGTSTP);
+        gstate.user_run_request = USER_RUN_REQUEST_NEVER;
         break;
     case SIGCONT:
-        msg_printf(NULL, MSG_INFO, "Resuming activity");
-        gstate.active_tasks.unsuspend_all();
-        boinc_set_signal_handler_force(SIGTSTP, signal_handler);
+        gstate.user_run_request = USER_RUN_REQUEST_AUTO;
         break;
     default:
-        msg_printf(NULL, MSG_INFO, "Signal not handled");
+        msg_printf(NULL, MSG_WARNING, "Signal not handled");
     }
 }
 #endif
diff --git a/win_build/installer/BOINC.pfw b/win_build/installer/BOINC.pfw
index c7696e7dac..dc0dc1f57f 100755
--- a/win_build/installer/BOINC.pfw
+++ b/win_build/installer/BOINC.pfw
@@ -14,8 +14,8 @@ ApplicationName=BOINC
 Description=Berkeley Open Infrastructure for Network Computing
 Comments=
 Notice=Copyright 2002-2004 University of California, Berkeley
-Version=3.03
-OutputSpec=boinc_3.03_windows_intelx86.exe
+Version=3.04
+OutputSpec=boinc_3.04_windows_intelx86.exe
 GUIDs=0
 Type=2
 Compress=1
diff --git a/win_build/installer/Media/Default/default.mda b/win_build/installer/Media/Default/default.mda
index 0d3cc8eb50..e58bbc0bcd 100755
--- a/win_build/installer/Media/Default/default.mda
+++ b/win_build/installer/Media/Default/default.mda
@@ -34,8 +34,8 @@ WIN32SENABLE=No
 Language Files\English=No
 Help Files=No
 Language Files\Italiano=No
-Language Files\Deutsch=No
 Language Files=No
+Language Files\Deutsch=No
 Program Files=No
 Screensaver Files=No
 Language Files\Espanol=No