diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 588629149f..a93eb816bb 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -144,8 +144,8 @@ if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
 			:
  		;
 	} else {
-		InstallOptionalHaikuImagePackage bzr-2.2.0-x86-gcc2-2010-09-15.zip
-			: $(baseURL)/bzr-2.2.0-x86-gcc2-2010-09-16.zip
+		InstallOptionalHaikuImagePackage bzr-2.2.1-x86-gcc2-2010-10-16.zip
+			: $(baseURL)/bzr-2.2.1-x86-gcc2-2010-10-16.zip
 			:
 		;
 	}
@@ -1044,12 +1044,10 @@ if [ IsOptionalHaikuImagePackageAdded Nano ] {
 		Echo "No optional package Nano available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			nano-2.2.3-r1a2-x86-gcc2-2010-04-22-a.zip
-			: $(baseURL)/nano-2.2.3-r1a2-x86-gcc2-2010-04-22-a.zip
+			nano-2.2.5-x86-gcc2-2010-10-16.zip
+			: $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip
 			:
 		;
-		InstallSourceArchive nano-2.2.3_haiku-2010-04-29.tar.xz
-			: $(baseSourceURL)/nano-2.2.3_haiku-2010-04-29.tar.xz ;
 	}
 }
 
@@ -1060,8 +1058,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] {
 		Echo "No optional package Neon available for $(TARGET_ARCH)" ;
 	} else {
 		InstallOptionalHaikuImagePackage
-			neon-0.29.4-x86-gcc2-2010-10-01.zip
-			: $(baseURL)/neon-0.29.4-x86-gcc2-2010-10-01.zip
+			neon-0.29.5-x86-gcc2-2010-10-16.zip
+			: $(baseURL)/neon-0.29.5-x86-gcc2-2010-10-16.zip
 			:
 		;
 	}