diff --git a/checkin_notes b/checkin_notes
index 62de8e5feb..5796049715 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9738,5 +9738,10 @@ Rom    Feb 4 2004
     lib/
         util.c,h
 
-        
-        
+Rom    Feb 4 2004
+    - Changed from using SHGetSpecialFolder to SHGetFolderPath which now uses COM and so will
+        will not throw a dynamic link error on startup for platforms that don't support it.
+    
+    client
+        win/
+            win_screensaver.cpp
diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index 37ad16a807..10b983fd43 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -1476,7 +1476,7 @@ BOOL CScreensaver::IsConfigStartupBOINC()
 		// It could be in the global startup group
 		ZeroMemory( szBuffer, 512 );
 		bCheckFileExists = FALSE;
-		if (SHGetSpecialFolderPath(NULL, szBuffer, CSIDL_STARTUP, FALSE))
+		if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_STARTUP|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, szBuffer)))
 		{
 			TRACE(TEXT("IsConfigStartupBOINC: SHGetSpecialFolderPath - CSIDL_STARTUP - '%s'\n"), szBuffer);
 			if (SUCCEEDED(StringCchCatN(szBuffer, 512, TEXT("\\BOINC.lnk"), 10)))
@@ -1519,7 +1519,7 @@ BOOL CScreensaver::IsConfigStartupBOINC()
 				// It could be in the global startup group
 				ZeroMemory( szBuffer, 512 );
 				bCheckFileExists = FALSE;
-				if (SHGetSpecialFolderPath(NULL, szBuffer, CSIDL_COMMON_STARTUP, FALSE))
+				if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_COMMON_STARTUP|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, szBuffer)))
 				{
 					TRACE(TEXT("IsConfigStartupBOINC: SHGetSpecialFolderPath - CSIDL_COMMON_STARTUP - '%s'\n"), szBuffer);
 					if (SUCCEEDED(StringCchCatN(szBuffer, 512, TEXT("\\BOINC.lnk"), 10)))