diff --git a/usr/bin/abuild.orig b/usr/bin/abuild
index 71e0681..d4ae3dd 100755
--- a/usr/bin/abuild.orig
+++ b/usr/bin/abuild
@@ -2231,7 +2231,11 @@ calcdeps() {
 			list_has $i $builddeps && continue
 			subpackages_has ${i%%[<>=]*} || builddeps="$builddeps $i"
 		done
-		hostdeps="$EXTRADEPENDS_TARGET"
+		for i in $EXTRADEPENDS_HOST $EXTRADEPENDS_TARGET $depends $makedepends; do
+			[ "$pkgname" = "${i%%[<>=]*}" ] && continue
+			list_has $i $hostdeps && continue
+			subpackages_has ${i%%[<>=]*} || hostdeps="$hostdeps $i"
+		done
 	fi
 }