diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index d468dccc94..e6870b2fd1 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -933,14 +933,14 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
-				KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
-				: $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ;
+				KeymapSwitcher-1.2.6-r1a3-x86-gcc4-2011-05-31.zip
+				: $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc4-2011-05-31.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
-				: $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ;
+				KeymapSwitcher-1.2.6-r1a3-x86-gcc2-2011-05-31.zip
+				: $(baseURL)/KeymapSwitcher-1.2.6-r1a3-x86-gcc2-2011-05-31.zip ;
 		}
-		AddSymlinkToHaikuImage home config be Desktop\ applets
+		AddSymlinkToHaikuImage home config be Preferences
 			: /boot/common/bin/KeymapSwitcher ;
 	}
 }