diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index a123d851a7..d2e1c2c335 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -22,6 +22,7 @@ OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies NetFS : UserlandFS ;
 OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;
+OptionalPackageDependencies Paladin : CCache Fastdep ;
 OptionalPackageDependencies Pe : PCRE ;
 OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
 OptionalPackageDependencies Transmission : LibEvent GetText Curl OpenSSL LibIconv ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 88de35457c..f97fc659a4 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -25,6 +25,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	BeZillaBrowser			- fork of Mozilla's 1.8 branch.
 #	Bluetooth				- experimental Haiku components for Bluetooth
 #	Bzip					- file archiving utility
+#	CCache					- fast compiler cache
 #	CDRecord				- the command line CD writing tools
 #	Clockwerk				- native audio/video compositing
 #	CLucene					- indexed file search
@@ -35,6 +36,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	DevelopmentBase			- basic development environment (gcc, headers, libs,...)
 #	DevelopmentMin			- development headers, libs, tools, from sources only
 #	Expat					- XML parsing libraries
+#	Fastdep					- fast dependency generator for C/C++ files
 #	friss					- RSS/ATOM/... feeds reader
 #	GetText					- a framework to help produce multi-lingual messages.
 #	Git						- the distributed version control system
@@ -59,11 +61,13 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	OpenSSH					- the secure shell
 #	OpenSSL					- secure sockets library
 #	P7zip					- file archiving utility
+#	Paladin					- a Haiku IDE
 #	PCRE					- the (Perl-compatible) regex engine
 #	Pe						- the powerful native Programmer's Editor
 #	Perl					- the scripting language
 #	Python					- the scripting language
 #	Rsync					- remote directory synchronization
+#	Ruby					- the programming language
 #	Sed						- the ultimate stream editor
 #	SQLite					- the database implementation
 #	Subversion				- the version control system
@@ -308,6 +312,20 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] {
 }
 
 
+# CCache
+if [ IsOptionalHaikuImagePackageAdded CCache ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package CCache available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage
+			ccache-3.0.1-x86-gcc2-2010-08-30.zip
+			: $(baseURL)/ccache-3.0.1-x86-gcc2-2010-08-30.zip
+			:
+		;
+	}
+}
+
+
 # CDRecord
 if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
 	if $(TARGET_ARCH) != x86 {
@@ -625,6 +643,20 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
 }
 
 
+# Fastdep
+if [ IsOptionalHaikuImagePackageAdded Fastdep ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Fastdep available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage
+			fastdep-0.16-x86-gcc2-2010-09-02.zip
+			: $(baseURL)/fastdep-0.16-x86-gcc2-2010-09-02.zip
+			:
+		;
+	}
+}
+
+
 # friss
 if [ IsOptionalHaikuImagePackageAdded friss ] {
 	if $(TARGET_ARCH) != x86 {
@@ -1133,6 +1165,30 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
 }
 
 
+# Paladin
+if [ IsOptionalHaikuImagePackageAdded Paladin ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Paladin available for $(TARGET_ARCH)" ;
+	} else {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage paladin-1.3-x86-gcc4-2010-09-06.zip
+				: $(baseURL)/paladin-1.3-x86-gcc4-2010-09-06.zip
+			;
+		} else {
+			InstallOptionalHaikuImagePackage
+				paladin-1.3-x86-gcc2-2010-09-06.zip
+			: $(baseURL)/paladin-1.3-x86-gcc2-2010-09-06.zip
+			;
+		}
+
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/Paladin/Paladin ;
+		AddSymlinkToHaikuImage common bin
+			: /boot/apps/Paladin/Paladin ;
+	}
+}
+
+
 # PCRE regex engine
 if [ IsOptionalHaikuImagePackageAdded PCRE ] {
 	if $(TARGET_ARCH) != x86 {
@@ -1228,6 +1284,20 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] {
 }
 
 
+# Ruby
+if [ IsOptionalHaikuImagePackageAdded Ruby ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Ruby available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage
+			ruby-1.9.1-x86-gcc2-2010-05-20.zip
+			: $(baseURL)/ruby-1.9.1-x86-gcc2-2010-05-20.zip
+			:
+		;
+	}
+}
+
+
 # Sed
 if [ IsOptionalHaikuImagePackageAdded Sed ] {
 	if $(TARGET_ARCH) != x86 {