diff --git a/Jamfile b/Jamfile
index cce7bfef6f..67fa41b99a 100644
--- a/Jamfile
+++ b/Jamfile
@@ -28,7 +28,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
 	regular_image @{
 		bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep gutenprint
 		gzip jasper jpeg
-		less libicns libpcap libpng libpng16 libwebp
+		less libicns libpcap libpng16 libwebp
 		mesa mesa_devel mesa_swrast
 		netcat
 		sed sharutils
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 87bdc09cab..38a57b7d91 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -359,7 +359,7 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
 
 
 # libpng
-if [ IsPackageAvailable libpng_devel ] {
+if [ IsPackageAvailable libpng16_devel ] {
 	ExtractBuildFeatureArchives libpng :
 		file: base libpng16
 			runtime: lib
@@ -538,13 +538,13 @@ if [ IsPackageAvailable libwebp_devel ] {
 
 
 # ncurses
-if [ IsPackageAvailable ncurses_devel ] {
+if [ IsPackageAvailable ncurses6_devel ] {
 	ExtractBuildFeatureArchives ncurses :
-		file: base ncurses
+		file: base ncurses6
 			runtime: lib
-		file: devel ncurses_devel
+		file: devel ncurses6_devel
 			depends: base
-			library: $(developLibDir)/libncurses.so.5
+			library: $(developLibDir)/libncurses.so.6
 			headers: $(developHeadersDir)
 		;
 
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 8173eda7d5..23514deef5 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -71,9 +71,10 @@ requires {
 	lib:libicutest
 	lib:libicutu
 	lib:libicuuc
+	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 #endif
 	lib:libsolv
 	lib:libsolvext
diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku
index 4e840a628f..b930f51d0a 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -65,7 +65,7 @@ requires {
 	lib:libgcc_s
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 #endif
 	lib:libsolv
 	lib:libsolvext
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index aa7efcaddf..8cb50c842f 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -71,9 +71,10 @@ requires {
 	lib:libicutest
 	lib:libicutu
 	lib:libicuuc
+	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 #endif
 	lib:libsolv
 	lib:libsolvext
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 423e89384e..b15f70afd2 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -72,13 +72,14 @@ requires {
 	lib:libicutest
 	lib:libicutu
 	lib:libicuuc
+	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libexpat
 	lib:libgutenprint
 	lib:libicns
 	lib:libjasper
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 	lib:libqrencode
 	lib:libtiff
 	lib:libwebp
diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
index c4ff4fb822..1579da854e 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -71,13 +71,14 @@ requires {
 	lib:libicutest
 	lib:libicutu
 	lib:libicuuc
+	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libexpat
 	lib:libgutenprint
 	lib:libicns
 	lib:libjasper
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 	lib:libqrencode
 	lib:libtiff
 	lib:libwebp
diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
index 856385929a..f0ca21ceca 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -72,13 +72,14 @@ requires {
 	lib:libicutest
 	lib:libicutu
 	lib:libicuuc
+	lib:libncurses >= 6.0
 #ifdef HAIKU_REGULAR_BUILD
 	lib:libexpat
 	lib:libgutenprint
 	lib:libicns
 	lib:libjasper
 	lib:libjpeg
-	lib:libpng
+	lib:libpng >= 16.0
 	lib:libqrencode
 	lib:libtiff
 	lib:libwebp