diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index c29a6e211f8..1549979d024 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,7 +1,7 @@
 # Template file for 'julia'
 pkgname=julia
 version=0.6.1
-revision=1
+revision=2
 wrksrc="julia"
 nocross=yes
 build_style=gnu-makefile
@@ -15,10 +15,10 @@ hostmakedepends="curl llvm3.9 gcc-fortran perl cmake python m4 git"
 makedepends="openblas-devel lapack-devel arpack-ng-devel
  fftw-devel pcre2-devel gmp-devel mpfr-devel libgit2-devel
  libcurl-devel libssh2-devel mbedtls-devel"
-depends="libllvm3.9 openblas lapack arpack-ng libfftw
- libpcre2 gmp mpfr libgit2 libcurl libssh2 mbedtls"
+depends="libllvm3.9 openblas lapack-devel arpack-ng libfftw
+ libpcre2 gmp mpfr-devel libgit2-devel libcurl libssh2 mbedtls"
 conf_files="/etc/julia/juliarc.jl"
-only_for_archs="i686 x86_64"
+only_for_archs="i686 x86_64 i686-musl x86_64-musl"
 short_desc="High-level, high-performance dynamic programming language"
 maintainer="Francisco Gómez <espectalll@kydara.com>"
 license="MIT"
@@ -26,14 +26,25 @@ homepage="https://julialang.org"
 distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}.tar.gz"
 checksum=e68adfa85df529f8ad092a9bf85d2350101c658fe455c5ebf2b6d119359e10d9
 
-case $XBPS_MACHINE in
-i686)
+case "$XBPS_TARGET_MACHINE" in
+i686-musl)
+	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo -lc"
+	;;
+x86_64-musl)
+	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo"
+	;;
+esac
+
+case "$XBPS_TARGET_MACHINE" in
+i686*)
 	export M="pentium4"
 	export CFLAGS="-march=pentium4"
 	export CXXFLAGS="-march=pentium4"
 	make_build_args+=" MARCH=pentium4"
 	;;
-x86_64)
+x86_64*)
 	export M="x86-64"
 	export CFLAGS="-march=x86-64"
 	export CXXFLAGS="-march=x86-64"