diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 850ba1fd77..3ddf6e0c43 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -810,11 +810,10 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc4-2012-10-30.zip ;
 	} else {
-		HAIKU_ZLIB_FILE = zlib-1.2.8-1-x86_gcc2.hpkg ;
-		HAIKU_ZLIB_DEVEL_FILE = zlib_devel-1.2.8-1-x86_gcc2.hpkg ;
+		HAIKU_ZLIB_FILE = zlib-1.2.8-2-x86_gcc2.hpkg ;
+		HAIKU_ZLIB_DEVEL_FILE = zlib_devel-1.2.8-2-x86_gcc2.hpkg ;
 	}
-	HAIKU_ZLIB_SOURCE_FILE = zlib_source-1.2.8-1-x86_gcc2.hpkg ;
-		# TODO: Wrong architecture! Should be "any".
+	HAIKU_ZLIB_SOURCE_FILE = zlib_source-1.2.8-2-source.hpkg ;
 
 	ExtractBuildFeatureArchives zlib :
 		file: base $(zlibBaseURL)/$(HAIKU_ZLIB_FILE)
@@ -824,8 +823,7 @@ if $(TARGET_ARCH) in arm ppc x86 x86_64 {
 			library: develop/lib/libz.so
 			headers: develop/headers
 		file: source $(zlibBaseURL)/$(HAIKU_ZLIB_SOURCE_FILE)
-			sources: source/zlib-1.2.8
-		;
+			sources: develop/sources/zlib-1.2.8-2/source
 
 	EnableBuildFeatures zlib ;
 } else {
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index e050ed05ad..31bfa7376c 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -8,12 +8,13 @@ OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies BurnItNow : CDRecord ;
 OptionalPackageDependencies Caya : Expat ;
-OptionalPackageDependencies CDRecord : GetText LibIconv ;
+OptionalPackageDependencies CDRecord : GetTextLibintl LibIconv ;
 OptionalPackageDependencies Curl : OpenSSL ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies Development : DevelopmentBase Perl Zlib-devel ;
 OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ;
-OptionalPackageDependencies GetText : LibIconv ;
+OptionalPackageDependencies GetText : GetTextLibintl ;
+OptionalPackageDependencies GetTextLibintl : LibIconv ;
 OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
 OptionalPackageDependencies GitDoc : Man Git ;
 OptionalPackageDependencies ICU-devel : DevelopmentBase ;
@@ -37,7 +38,7 @@ OptionalPackageDependencies Readline : NCurses ;
 OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplug physfs ;
 OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
 OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
-OptionalPackageDependencies Vim : GetText LibIconv ;
+OptionalPackageDependencies Vim : GetTextLibintl LibIconv ;
 OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ;
 OptionalPackageDependencies wpa_supplicant : OpenSSL ;
 OptionalPackageDependencies XZ-Utils : Tar ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c5f3559d9a..6b91d17613 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -46,6 +46,7 @@
 #	Fastdep					- fast dependency generator for C/C++ files
 #	friss					- RSS/ATOM/... feeds reader
 #	GetText					- a framework to help produce multi-lingual messages.
+#	GetTextLibintl			- GetText's libintl
 #	Git						- the distributed version control system
 #	GitDoc					- documentation for the distributed version control system
 #	GPerf					- the perfect hash function generator.
@@ -882,7 +883,7 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
 				: : cdPackage ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/gettext-0.18.1.1-3-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/gettext-0.18.1.1-4-x86_gcc2.hpkg ;
 		}
 	} else if $(TARGET_ARCH) = x86_64 {
 		InstallOptionalHaikuImagePackage
@@ -894,6 +895,27 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
 }
 
 
+# GetTextLibintl
+if [ IsOptionalHaikuImagePackageAdded GetTextLibintl ] {
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+#			InstallOptionalHaikuImagePackage
+#				$(baseURL)/gettext-0.18.1.1-r1a4-x86-gcc4-2012-08-30.zip
+#				: : cdPackage ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				$(hpkgBaseURL)/gettext_libintl-0.18.1.1-4-x86_gcc2.hpkg ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
+#		InstallOptionalHaikuImagePackage
+#			$(baseURL)/gettext-0.18.1.1-x86_64-2012-08-17.zip
+#			: : cdPackage ;
+	} else {
+		Echo "No optional package GetText available for $(TARGET_ARCH)" ;
+	}
+}
+
+
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
 	if $(TARGET_ARCH) = x86 {
@@ -1126,7 +1148,7 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
 				$(baseURL)/libiconv-1.13.1-r1a4-x86-gcc4-2012-08-30.zip ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/libiconv-1.13.1-4-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/libiconv-1.13.1-5-x86_gcc2.hpkg ;
 		}
 	} else if $(TARGET_ARCH) = x86_64 {
 		InstallOptionalHaikuImagePackage
@@ -1323,7 +1345,7 @@ if [ IsOptionalHaikuImagePackageAdded NCurses ] {
 			Echo "No optional package NCurses available for gcc 4" ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/ncurses-5.9-6-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/ncurses-5.9-7-x86_gcc2.hpkg ;
 		}
 	}
 }