diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index f5341f635ac..144d44b709d 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -1,15 +1,15 @@
 # Template file for 'crystal'
 pkgname=crystal
 version=0.24.1
-revision=5
+revision=6
 _shardsversion=0.7.2
 _bootstrapversion=0.24.1
 _bootstraprevision=2
-hostmakedepends="$(vopt_if binary_bootstrap "" crystal) git llvm"
+hostmakedepends="git llvm"
 makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
  libxml2-devel"
 depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm gcc"
+ libxml2-devel gmp-devel libressl-devel llvm gcc pkg-config"
 checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
 short_desc="The Crystal Programming Language"
 maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
@@ -26,10 +26,10 @@ _crystalflags="--release --no-debug --progress"
 
 build_options="binary_bootstrap"
 build_options_default="binary_bootstrap"
-desc_option_oracle_bootstrap="Bootstrap using precompiled binaries"
+desc_option_binary_bootstrap="Bootstrap using precompiled binaries"
 
 if [ "$build_option_binary_bootstrap" ]; then
-	case "$XBPS_TARGET_MACHINE" in
+	case "$XBPS_MACHINE" in
 	x86_64)
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/v${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-x86_64.tar.gz"
 		checksum+=" b75df8522f2302270b48e6b77812a0cb0086e338cdf884227e0076afbf83aca7"
@@ -38,9 +38,12 @@ if [ "$build_option_binary_bootstrap" ]; then
 		distfiles+=" https://github.com/crystal-lang/crystal/releases/download/v${_bootstrapversion}/crystal-${_bootstrapversion}-${_bootstraprevision}-linux-i686.tar.gz"
 		checksum+=" 4f45f8ea57486be0f8d035c466edda848b7e1a7aa809fff4ea31311fd8ebea97"
 		;;
-	*)	broken="cannot be built for $XBPS_TARGET_MACHINE"
+	*)
+		broken="cannot be built on $XBPS_MACHINE"
 		;;
 	esac
+else
+	hostmakedepends+=" crystal"
 fi
 
 do_extract() {