diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template
index 046cd7bc847..b54d1f77dab 100644
--- a/srcpkgs/julia/template
+++ b/srcpkgs/julia/template
@@ -1,10 +1,10 @@
 # Template file for 'julia'
 pkgname=julia
 version=0.6.0
-revision=2
+revision=3
 nocross=yes
 build_style=gnu-makefile
-make_build_args="prefix=/usr MARCH=core2 sysconfdir=/etc USE_SYSTEM_LLVM=1
+make_build_args="prefix=/usr sysconfdir=/etc USE_SYSTEM_LLVM=1
  USE_LLVM_SHLIB=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1
  USE_SYSTEM_LAPACK=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_GMP=1
  USE_SYSTEM_MPFR=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_LIBUV=0
@@ -29,6 +29,12 @@ if [[ $XBPS_MACHINE == 'i686' ]]; then
 	export M="pentium4"
 	export CFLAGS="-march=pentium4"
 	export CXXFLAGS="-march=pentium4"
+	make_build_args+=" MARCH=pentium4"
+elif [[ $XBPS_MACHINE == 'x86_64' ]]; then
+	export M="core2"
+	export CFLAGS="-march=core2"
+	export CXXFLAGS="-march=core2"
+	make_build_args+=" MARCH=core2"
 fi
 
 post_install() {