diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 736ea7a5ff..1196bcd40d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -489,8 +489,8 @@ if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
 	InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
 		: $(baseSourceURL)/automake-1.11.1_haiku-2010-04-29.tar.xz
 	;
-	InstallOptionalHaikuImagePackage libtool-2.2.10-x86-gcc2-2010-06-10.zip
-		: $(baseURL)/libtool-2.2.10-x86-gcc2-2010-06-10.zip
+	InstallOptionalHaikuImagePackage libtool-2.4-x86-gcc2-2010-09-25.zip
+		: $(baseURL)/libtool-2.4-x86-gcc2-2010-09-25.zip
 		:
 		: true
 	;
@@ -555,6 +555,10 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		: $(baseSourceURL)/flex-2.5.35_haiku-2010-04-29.tar.xz ;
 	InstallOptionalHaikuImagePackage jam-2.5-r1a2-x86-gcc2-2010-04-21.zip
 		: $(baseURL)/jam-2.5-r1a2-x86-gcc2-2010-04-21.zip ;
+	InstallOptionalHaikuImagePackage mkdepend-1.7-x86-gcc2-2010-09-24.zip
+		: $(baseURL)/mkdepend-1.7-x86-gcc2-2010-09-24.zip ;
+	InstallOptionalHaikuImagePackage make-3.82-x86-gcc2-2010-09-25.zip
+		: $(baseURL)/make-3.82-x86-gcc2-2010-09-25.zip ;
 }
 
 
@@ -625,11 +629,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 	SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
 	AddFilesToHaikuImage system bin : $(scripts) ;
 
-	# make and mkdepend build tool, which are part of the Haiku source tree
-	# TODO: Both should be removed from the tree, made download packages
-	# and moved to the DevelopmentBase package.
-	AddFilesToHaikuImage system bin : make mkdepend ;
-
 	# skeleton makefile and makefile-engine
 	local makefileEngineFiles =
 		<makefile-engine>makefile