diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
index a3b81cb425121..9f1fb4d2a5bd3 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
@@ -20,7 +20,7 @@ IUSE="html jbig lcms ldap mgetty pam"
 
 DEPEND="
 	app-text/ghostscript-gpl
-	media-libs/tiff[jbig?]
+	media-libs/tiff:=[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
 	app-alternatives/awk
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
similarity index 98%
rename from net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
rename to net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
index b5e33be8f0545..3f86a507030c4 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r8.ebuild
@@ -20,11 +20,11 @@ IUSE="html jbig lcms ldap mgetty pam"
 
 DEPEND="
 	app-text/ghostscript-gpl
-	media-libs/tiff:0[jbig?]
+	media-libs/tiff:=[jbig?]
+	media-libs/libjpeg-turbo:=
 	!net-dialup/mgetty[fax]
 	>=sys-libs/zlib-1.1.4
 	app-alternatives/awk
-	virtual/jpeg:0
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
 	lcms? ( media-libs/lcms )
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
similarity index 99%
rename from net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
rename to net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
index 3a82ac03b4133..5355dac3b1757 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
@@ -20,7 +20,7 @@ IUSE="html jbig lcms ldap mgetty pam"
 
 DEPEND="
 	app-text/ghostscript-gpl
-	media-libs/tiff[jbig?]
+	media-libs/tiff:=[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
 	app-alternatives/awk