diff --git a/media-libs/lcms/lcms-2.9.recipe b/media-libs/lcms/lcms-2.9.recipe
index fdf40e86e..374507fb9 100644
--- a/media-libs/lcms/lcms-2.9.recipe
+++ b/media-libs/lcms/lcms-2.9.recipe
@@ -8,7 +8,7 @@ approved as an International Standard, ISO 15076-1, in 2005."
 HOMEPAGE="http://www.littlecms.com/"
 COPYRIGHT="1998-2017 Marti Maria"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://downloads.sourceforge.net/lcms/lcms2-$portVersion.tar.gz"
 CHECKSUM_SHA256="48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20"
 SOURCE_DIR="lcms2-$portVersion"
@@ -23,14 +23,12 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="2.0.8"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	lcms$secondaryArchSuffix = $portVersion compat >= 2
-	cmd:jpgicc$commandSuffix
-	cmd:linkicc$commandSuffix
-	cmd:psicc$commandSuffix
-	cmd:tificc$commandSuffix
-	cmd:transicc$commandSuffix
-	lib:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2
+	lcms$secondaryArchSuffix = $portVersion
+	lib:liblcms2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -41,20 +39,15 @@ REQUIRES="
 
 PROVIDES_devel="
 	lcms${secondaryArchSuffix}_devel = $portVersion
-	devel:liblcms2$secondaryArchSuffix = 2.0.8 compat >= 2
+	devel:liblcms2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	lcms$secondaryArchSuffix == $portVersion base
-	devel:libjpeg$secondaryArchSuffix >= 9
-	devel:libpng$secondaryArchSuffix
-	devel:libtiff$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libjpeg$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix >= 9
 	devel:libtiff$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -68,6 +61,25 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PROVIDES_tools="
+	lcms${secondaryArchSuffix}_tools = $portVersion
+	cmd:jpgicc$commandSuffix
+	cmd:linkicc$commandSuffix
+	cmd:psicc$commandSuffix
+	cmd:tificc$commandSuffix
+	cmd:transicc$commandSuffix
+	"
+REQUIRES_tools="
+	lcms$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage lcms$secondaryArchSuffix \
+	$libDir/liblcms2.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
@@ -84,12 +96,15 @@ INSTALL()
 
 	# prepare develop/lib
 	prepareInstalledDevelLibs liblcms2
-
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	packageEntries tools \
+		$commandBinDir \
+		$manDir
 }
 
 TEST()