diff --git a/checkin_notes b/checkin_notes
index 761e90902d..aa6da58501 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4473,3 +4473,12 @@ David  3 May 2006
             result.inc
     sched/
         feeder.C
+
+Rom    4 May 2006
+    - Bug Fix: Increase the WaitHint from 10 seconds to 30 seconds so
+        the service mode install isn't so jumpy when it takes awhile
+        to shutdown.
+        
+    client/win/
+        win_service.cpp
+
diff --git a/client/win/win_service.cpp b/client/win/win_service.cpp
index afd9a08e2b..5a58bf23e1 100644
--- a/client/win/win_service.cpp
+++ b/client/win/win_service.cpp
@@ -114,7 +114,7 @@ VOID WINAPI service_ctrl(DWORD dwCtrlCode)
         // error.
         case SERVICE_CONTROL_STOP:
 		case SERVICE_CONTROL_SHUTDOWN:
-            ReportStatus(SERVICE_STOP_PENDING, ERROR_SUCCESS, 10000);
+            ReportStatus(SERVICE_STOP_PENDING, ERROR_SUCCESS, 30000);
 			quit_client();
             return;