diff --git a/lang/julia/Makefile b/lang/julia/Makefile
index ed675b887a77..1970a50a9604 100644
--- a/lang/julia/Makefile
+++ b/lang/julia/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	julia
-PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTVERSION=	0.6.3
 DISTVERSIONSUFFIX=	-full
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
@@ -29,7 +28,7 @@ BUILD_DEPENDS=	patchelf:sysutils/patchelf \
 USES=		gmake compiler:c++11-lib fortran
 USE_LDCONFIG=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=	${WRKDIR}/${PORTNAME}
 
 ALL_TARGET=	default
 INSTALL_TARGET=	install
diff --git a/lang/julia/distinfo b/lang/julia/distinfo
index 58f90772aef9..6654b2a2fbf5 100644
--- a/lang/julia/distinfo
+++ b/lang/julia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513219335
-SHA256 (julia-0.6.2-full.tar.gz) = 1e34c13091c9ddb47cf87a51566d94a06613f3db3c483b8f63b276e416dd621b
-SIZE (julia-0.6.2-full.tar.gz) = 90160534
+TIMESTAMP = 1528732844
+SHA256 (julia-0.6.3-full.tar.gz) = 2b5b0d84e49ca88fdec6d54a64eba4ce77f5c5cb8f34d307f3ba0ec04a89913a
+SIZE (julia-0.6.3-full.tar.gz) = 90879414
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile
index f8824c92ce41..d3816ff4528c 100644
--- a/lang/julia/files/patch-Makefile
+++ b/lang/julia/files/patch-Makefile
@@ -60,7 +60,7 @@
  		install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \
  		install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \
  	done
--else ifeq ($(OS), Linux)
+-else ifneq (,$(findstring $(OS),Linux FreeBSD))
 +else
  	for julia in $(DESTDIR)$(bindir)/julia* ; do \
  		patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \