diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 60d1ad4e4..3996d9f95 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-05  Earnie Boyd  <earnie@users.sf.net>
+
+	* lib/scrnsave.c: Correct misspelled SPI_SCREENSAVERUNNING to
+	SPI_SETSCREENSAVERUNNING.
+	* include winuser.h (SPI_SCREENSAVERRUNNING): Remove again.
+
 2006-05-04  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/winuser.h (SPI_SCREENSAVERRUNNING): Define.
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 69664ea06..8824fb3d1 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1229,7 +1229,6 @@ extern "C" {
 #define SPI_ICONHORIZONTALSPACING 0x000D
 #define SPI_ICONVERTICALSPACING 0x0018
 #define SPI_LANGDRIVER 0x000C
-#define SPI_SCREENSAVERRUNNING 0x0061
 #define SPI_SETACCESSTIMEOUT 0x003D
 #define SPI_SETACTIVEWINDOWTRACKING 0x1001
 #define SPI_SETACTIVEWNDTRKTIMEOUT 8195
diff --git a/winsup/w32api/lib/scrnsave.c b/winsup/w32api/lib/scrnsave.c
index 53e555d7d..fe3348b4e 100644
--- a/winsup/w32api/lib/scrnsave.c
+++ b/winsup/w32api/lib/scrnsave.c
@@ -182,7 +182,7 @@ static int LaunchScreenSaver(HWND hParent)
 
   /* don't allow other tasks to get into the foreground */
   if (w95 && !fChildPreview)
-    SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0);
+    SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &foo, 0);
 
   msg.wParam = 0;
 
@@ -231,7 +231,7 @@ static int LaunchScreenSaver(HWND hParent)
 restore:
   /* restore system */
   if (w95 && !fChildPreview)
-    SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0);
+    SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &foo, 0);
   FreeLibrary(hPwdLib);
   return msg.wParam;
 }