diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index 08677d4b8371..a99ce6da593d 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	julia
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
@@ -14,16 +13,15 @@ COMMENT=	Julia Language: A fresh approach to technical computing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=	libunwind.so:devel/libunwind \
-		libutf8proc.so:textproc/utf8proc \
-		libopenblasp.so:math/openblas \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgit2.so:devel/libgit2 \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
-		libpcre2-8.so:devel/pcre2
-BUILD_DEPENDS=	llvm-config40:devel/llvm40 \
-		pcre2-config:devel/pcre2 \
-		patchelf:sysutils/patchelf
+		libopenblasp.so:math/openblas \
+		libpcre2-8.so:devel/pcre2 \
+		libutf8proc.so:textproc/utf8proc
+BUILD_DEPENDS=	patchelf:sysutils/patchelf \
+		pcre2-config:devel/pcre2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -42,12 +40,13 @@ PLIST_SUB=	VERSION="${PORTVERSION:R}" \
 CXXFLAGS+=	-stdlib=libc++ -std=c++11
 MAKE_ARGS+=	prefix=${PREFIX} JCXXFLAGS="${CXXFLAGS}" \
 		FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \
+		USE_SYSTEM_CURL=1 \
 		USE_GPL_LIBS=${USE_GPL_LIBS}
 
 OPTIONS_DEFINE=	EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE
 OPTIONS_DEFAULT=	SYSLIBM
 OPTIONS_GROUP=	PRIVATE
-OPTIONS_GROUP_PRIVATE=	ARPACK
+OPTIONS_GROUP_PRIVATE=	ARPACK LLVM
 OPTIONS_SINGLE=	LIBM
 OPTIONS_SINGLE_LIBM=	SYSLIBM OPENLIBM
 OPTIONS_SUB=	yes
@@ -76,8 +75,15 @@ DESKTOP_VARS=	INSTALL_TARGET+=install-desktop \
 
 ARPACK_DESC=	Build self-shipped private arpack-ng
 ARPACK_MAKE_ARGS=	USE_SYSTEM_ARPACK=0
-ARPACK_LIB_DEPENDS_OFF=	libarpack.so:math/arpack-ng
 ARPACK_MAKE_ARGS_OFF=	USE_SYSTEM_ARPACK=1
+ARPACK_LIB_DEPENDS_OFF=	libarpack.so:math/arpack-ng
+
+LLVM_DESC=	Build self-shipped private LLVM
+LLVM_MAKE_ARGS=	USE_SYSTEM_LLVM=0
+LLVM_MAKE_ARGS_OFF=	USE_SYSTEM_LLVM=1 LLVM_CONFIG=llvm-config40
+LLVM_BUILD_DEPENDS=	cmake:devel/cmake
+LLVM_BUILD_DEPENDS_OFF=	llvm-config40:devel/llvm40
+LLVM_USES=	python:build perl5
 
 SYSLIBM_DESC=	Build with system libm
 SYSLIBM_MAKE_ARGS=	USE_SYSTEM_LIBM=1
@@ -88,7 +94,7 @@ OPENLIBM_LIB_DEPENDS=	libopenlibm.so:math/openlibm
 
 .include <bsd.port.options.mk>
 
-NATIVE_DESC=		Build with native CPU jit tuning
+NATIVE_DESC=		Build with native CPU JIT tuning
 .if ${PORT_OPTIONS:MNATIVE}
 MAKE_ARGS+=	JULIA_CPU_TARGET=native
 .else
diff --git a/lang/julia/distinfo b/lang/julia/distinfo
index 193fdd337ac8..58f90772aef9 100644
--- a/lang/julia/distinfo
+++ b/lang/julia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497947201
-SHA256 (julia-0.6.0-full.tar.gz) = 933c91cf460ba37520d19034378907c3208358741ed92bd8184cebb575633522
-SIZE (julia-0.6.0-full.tar.gz) = 89904207
+TIMESTAMP = 1513219335
+SHA256 (julia-0.6.2-full.tar.gz) = 1e34c13091c9ddb47cf87a51566d94a06613f3db3c483b8f63b276e416dd621b
+SIZE (julia-0.6.2-full.tar.gz) = 90160534
diff --git a/lang/julia/files/patch-Make.user b/lang/julia/files/patch-Make.user
index 5e1f2d447c67..ef4f11f2d39f 100644
--- a/lang/julia/files/patch-Make.user
+++ b/lang/julia/files/patch-Make.user
@@ -5,19 +5,19 @@
 +USE_SYSTEM_GMP=		1
 +USE_SYSTEM_LAPACK=	1
 +USE_SYSTEM_LIBGIT2=	1
-+USE_SYSTEM_LIBUNWIND=	1
 +USE_SYSTEM_LIBUV=	0
-+USE_SYSTEM_LLVM=	1
 +USE_SYSTEM_MPFR=	1
 +USE_SYSTEM_PATCHELF=	1
 +USE_SYSTEM_PCRE=	1
 +USE_SYSTEM_UTF8PROC=	1
 +USE_SYSTEM_FFTW=	1
 +
-+LLVM_CONFIG=	llvm-config40
-+
 +LIBBLAS=	-lopenblasp -L$(LOCALBASE)/lib
 +LIBBLASNAME=	libopenblasp
 +
 +LIBLAPACK=	$(LIBBLAS)
 +LIBLAPACKNAME=	$(LIBBLASNAME)
++
++NO_GIT=	1
++
++override TAGGED_RELEASE_BANNER = "FreeBSD ports lang/julia build"
diff --git a/lang/julia/pkg-message b/lang/julia/pkg-message
new file mode 100644
index 000000000000..0499d697787c
--- /dev/null
+++ b/lang/julia/pkg-message
@@ -0,0 +1,7 @@
+*******************************************************************************
+* Known issue on FreeBSD 11.1-RELEASE or later
+*   - If you run into segfault with `Pkg.update()`,
+*     please issue `# sysctl security.bsd.stack_guard_page=0` to disable
+*     stack guard.
+*     For more info, please see https://github.com/JuliaLang/julia/issues/23328
+*******************************************************************************
diff --git a/lang/julia/pkg-plist b/lang/julia/pkg-plist
index 861dc1ea082e..31ccd102ce91 100644
--- a/lang/julia/pkg-plist
+++ b/lang/julia/pkg-plist
@@ -37,6 +37,9 @@ lib/julia/libdSFMT.so
 lib/julia/libopenspecfun.so
 lib/julia/libopenspecfun.so.1
 lib/julia/libopenspecfun.so.1.3
+%%LLVM%%lib/julia/libLLVM.so
+%%LLVM%%lib/julia/libLLVM-3.9.so
+%%LLVM%%lib/julia/libLLVM-3.9.1.so
 %%GPL_LIBS%%lib/julia/libamd.so
 %%GPL_LIBS%%lib/julia/libcamd.so
 %%GPL_LIBS%%lib/julia/libccolamd.so
@@ -375,6 +378,7 @@ lib/libjulia.so.%%SOVERSION%%
 %%DATADIR%%/test/checked.jl
 %%DATADIR%%/test/choosetests.jl
 %%DATADIR%%/test/cmdlineargs.jl
+%%DATADIR%%/test/codegen.jl
 %%DATADIR%%/test/combinatorics.jl
 %%DATADIR%%/test/compile.jl
 %%DATADIR%%/test/complex.jl
@@ -391,6 +395,7 @@ lib/libjulia.so.%%SOVERSION%%
 %%DATADIR%%/test/dates/ranges.jl
 %%DATADIR%%/test/dates/rounding.jl
 %%DATADIR%%/test/dates/types.jl
+%%DATADIR%%/test/deprecation_exec.jl
 %%DATADIR%%/test/dict.jl
 %%DATADIR%%/test/dimensionful.jl
 %%DATADIR%%/test/distributed.jl