diff --git a/Jamfile b/Jamfile
index f1cec2b1dd..a995ae3b39 100644
--- a/Jamfile
+++ b/Jamfile
@@ -27,7 +27,8 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
 
 	regular_image @{
 		bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jasper jpeg
-		less libicns libpng libwebp mesa mesa_devel mesa_swrast sed sharutils
+		less libicns libpng libpng16 libwebp mesa mesa_devel mesa_swrast
+		sed sharutils
 		tar tiff wget which
 	}@
 ] ;
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 1ce8114338..2697c4679b 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -361,11 +361,11 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
 # libpng
 if [ IsPackageAvailable libpng_devel ] {
 	ExtractBuildFeatureArchives libpng :
-		file: base libpng
+		file: base libpng16
 			runtime: lib
-		file: devel libpng_devel
+		file: devel libpng16_devel
 			depends: base
-			library: $(developLibDir)/libpng.so
+			library: $(developLibDir)/libpng16.so
 			headers: $(developHeadersDir)
 		;
 
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index f74b71fd66..c2f0e6432a 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -103,7 +103,7 @@ if [ IsOptionalHaikuImagePackageAdded Development ] {
 	for architectureObject in [ MultiArchSubDirSetup ] {
 		on $(architectureObject) {
 			AddHaikuImagePackages curl_devel ffmpeg_devel freetype_devel
-				glu_devel jpeg_devel libpng_devel zlib_devel ;
+				glu_devel jpeg_devel libpng16_devel zlib_devel ;
 		}
 	}
 }
diff --git a/build/jam/repositories/HaikuPorts/x86 b/build/jam/repositories/HaikuPorts/x86
index 95c6872602..26150055ed 100644
--- a/build/jam/repositories/HaikuPorts/x86
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -43,8 +43,8 @@ RemotePackageRepository HaikuPorts
 	ffmpeg_devel-0.10.2-4
 	flex-2.5.39-1
 	fossil-1.29-1
-	freetype-2.5.3-1
-	freetype_devel-2.5.3-1
+	freetype-2.5.3-4
+	freetype_devel-2.5.3-4
 	gawk-4.1.0-2
 	gcc-4.8.3_2014_07_26-2
 	gcc_syslibs-4.8.3_2014_07_26-2
@@ -202,8 +202,8 @@ RemotePackageRepository HaikuPorts
 	expat_x86_gcc2_devel-2.0.1-7
 	ffmpeg_x86_gcc2-0.10.2-4
 	ffmpeg_x86_gcc2_devel-0.10.2-4
-	freetype_x86_gcc2-2.5.3-1
-	freetype_x86_gcc2_devel-2.5.3-1
+	freetype_x86_gcc2-2.5.3-4
+	freetype_x86_gcc2_devel-2.5.3-4
 	gcc_x86_gcc2-2.95.3_2014_07_26-1
 	gcc_x86_gcc2_syslibs_devel-2.95.3_2014_07_26-1
 	gettext_x86_gcc2-0.18.1.1-6
diff --git a/build/jam/repositories/HaikuPorts/x86_64 b/build/jam/repositories/HaikuPorts/x86_64
index 5e4e19d690..7569a2a150 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -41,8 +41,8 @@ RemotePackageRepository HaikuPorts
 	flac_devel-1.3.0-3
 	flex-2.5.39-1
 	fossil-1.29-1
-	freetype-2.5.3-3
-	freetype_devel-2.5.3-3
+	freetype-2.5.3-4
+	freetype_devel-2.5.3-4
 	fribidi-0.19.6-2
 	fribidi_devel-0.19.6-2
 	gawk-4.1.0-2
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 b/build/jam/repositories/HaikuPorts/x86_gcc2
index 8e803c447f..ee7f166e7a 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -78,8 +78,8 @@ RemotePackageRepository HaikuPorts
 	fluidsynth-1.1.6-2
 	fluidsynth_devel-1.1.6-2
 	fossil-1.29-1
-	freetype-2.5.3-1
-	freetype_devel-2.5.3-1
+	freetype-2.5.3-4
+	freetype_devel-2.5.3-4
 	fribidi-0.19.5-1
 	fribidi_devel-0.19.5-1
 	friss-0.8.0-1
@@ -403,8 +403,8 @@ RemotePackageRepository HaikuPorts
 	fontconfig_x86-2.11.1-2
 	fontconfig_x86_devel-2.11.1-2
 	freedroidrpg_x86-0.15.1-1
-	freetype_x86-2.5.3-3
-	freetype_x86_devel-2.5.3-3
+	freetype_x86-2.5.3-4
+	freetype_x86_devel-2.5.3-4
 	fribidi_x86-0.19.5-1
 	fribidi_x86_devel-0.19.5-1
 	gcc_x86-4.8.3_2014_07_26-3