diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 3ba751acce..560d2fbc88 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -114,12 +114,12 @@ if [ IsOptionalHaikuImagePackageAdded APR ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package APR available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			apr-1.4.5-x86-gcc4-2011-08-03.zip
 			: $(baseURL)/apr-1.4.5-x86-gcc4-2011-08-03.zip
 			: : true ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			apr-1.4.5-x86-gcc2-2011-08-02.zip
 			: $(baseURL)/apr-1.4.5-x86-gcc2-2011-08-02.zip
 			: : true ;
@@ -132,12 +132,12 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			apr-util-1.3.12-x86-gcc4-2011-08-03.zip
 			: $(baseURL)/apr-util-1.3.12-x86-gcc4-2011-08-03.zip
 			: : true ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			apr-util-1.3.12-x86-gcc2-2011-08-02.zip
 			: $(baseURL)/apr-util-1.3.12-x86-gcc2-2011-08-02.zip
 			: : true ;
@@ -152,7 +152,7 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package ArmyKnife for gcc4" ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			armyknife-63-r1a3-x86-gcc2-2011-06-04.zip
 			: $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ;
 		AddSymlinkToHaikuImage home config be Applications
@@ -181,7 +181,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
 		Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				beae-22-r1a3-x86-gcc4-2011-05-24.zip
 				: $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
@@ -785,7 +785,7 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
 		Echo "No optional package friss available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				friss-24-r1a3-x86-gcc4-2011-05-31.zip
 				: $(baseURL)/friss-24-r1a3-x86-gcc4-2011-05-31.zip ;
 		} else {
@@ -1005,11 +1005,11 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Libmng available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip
 			: $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip
 			: $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip ;
 	}
@@ -1041,7 +1041,7 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip
-			: $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ;		
+			: $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip
@@ -1093,7 +1093,7 @@ if [ IsOptionalHaikuImagePackageAdded Man ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			 man-1.6f-r1a3-x86-gcc4-2011-05-24.zip
-			: $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ;		
+			: $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			 man-1.6f-r1a3-x86-gcc2-2011-05-18.zip
@@ -1200,7 +1200,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
 		Echo "No optional package NetSurf available for gcc4" ;
 	} else {
-		InstallOptionalHaikuImagePackage 
+		InstallOptionalHaikuImagePackage
 			netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip
 			: $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ;
 		AddSymlinkToHaikuImage home config be Applications
@@ -1309,11 +1309,11 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {
 		Echo "No optional package Paladin available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip
 				: $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip
 				: $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ;
 		}
@@ -1332,7 +1332,7 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] {
 		Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
 	} else {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip
 				: $(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ;
 		} else {
@@ -1503,7 +1503,7 @@ if [ IsOptionalHaikuImagePackageAdded TagLib ] {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage
 			taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip
-			: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;		
+			: $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ;
 	} else {
 		InstallOptionalHaikuImagePackage
 			taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip
@@ -1650,7 +1650,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
 			InstallOptionalHaikuImagePackage vision-908-r1a3-x86-gcc4-2011-06-07.zip
 				: $(baseURL)/vision-908-r1a3-x86-gcc4-2011-06-07.zip ;
 		} else {
-			InstallOptionalHaikuImagePackage 
+			InstallOptionalHaikuImagePackage
 				vision-908-r1a3-x86-gcc2-2011-06-07.zip
 				: $(baseURL)/vision-908-r1a3-x86-gcc2-2011-06-07.zip ;
 		}