diff --git a/jupyter/README.md b/jupyter/README.md
index c4de603..87fd682 100644
--- a/jupyter/README.md
+++ b/jupyter/README.md
@@ -44,6 +44,7 @@ The second line sets a persistent token. If this config value is unset, jupyter
    - pandas
  - Octave
  - R
+ - Julia
 
 
 ## TODO
@@ -54,6 +55,5 @@ The second line sets a persistent token. If this config value is unset, jupyter
  - Haskell ([source](https://github.com/IHaskell/ihaskell-notebook))
  - Rust Kernel
  - C++ Kernel
- - Julia Kernel
  - Perl Kernel
  - Maxima Kernel
diff --git a/jupyter/build/build.fish b/jupyter/build/build.fish
index 179d676..dd99ce3 100755
--- a/jupyter/build/build.fish
+++ b/jupyter/build/build.fish
@@ -52,6 +52,8 @@ printf "Done. \n\n"
 
 build_image false octave
 build_image false r
+build_image false julia
+#build_image false haskell (BROKEN)
 #build_image false sage (BROKEN)
 #build_image false selenium (BROKEN)
 
diff --git a/jupyter/build/julia.Dockerfile b/jupyter/build/julia.Dockerfile
new file mode 100644
index 0000000..5712e75
--- /dev/null
+++ b/jupyter/build/julia.Dockerfile
@@ -0,0 +1,46 @@
+ARG BASE_CONTAINER=betalupi/jupyter-base
+FROM $BASE_CONTAINER
+LABEL maintainer="Mark <mark@betalupi.com>"
+
+# install Julia packages in /opt/julia instead of $HOME
+ENV JULIA_DEPOT_PATH=/opt/julia
+ENV JULIA_PKGDIR=/opt/julia
+ENV JULIA_VERSION=1.4.1
+
+USER root
+
+WORKDIR /tmp
+RUN mkdir "/opt/julia-${JULIA_VERSION}" && \
+	wget -q https://julialang-s3.julialang.org/bin/linux/x64/$(echo "${JULIA_VERSION}" | cut -d. -f 1,2)"/julia-${JULIA_VERSION}-linux-x86_64.tar.gz" && \
+	echo "fd6d8cadaed678174c3caefb92207a3b0e8da9f926af6703fb4d1e4e4f50610a *julia-${JULIA_VERSION}-linux-x86_64.tar.gz" | sha256sum -c - && \
+	tar xzf "julia-${JULIA_VERSION}-linux-x86_64.tar.gz" -C "/opt/julia-${JULIA_VERSION}" --strip-components=1 && \
+	rm "/tmp/julia-${JULIA_VERSION}-linux-x86_64.tar.gz"
+RUN ln -fs /opt/julia-*/bin/julia /usr/local/bin/julia
+
+# Show Julia where conda libraries are \
+RUN mkdir /etc/julia && \
+	echo "push!(Libdl.DL_LOAD_PATH, \"$CONDA_DIR/lib\")" >> /etc/julia/juliarc.jl && \
+	# Create JULIA_PKGDIR \
+	mkdir "${JULIA_PKGDIR}" && \
+	chown "${NB_USER}" "${JULIA_PKGDIR}" && \
+	fix-permissions "${JULIA_PKGDIR}"
+
+USER $NB_UID
+
+# Add Julia packages. Only add HDF5 if this is not a test-only build since
+# it takes roughly half the entire build time of all of the images on Travis
+# to add this one package and often causes Travis to timeout.
+#
+# Install IJulia as jovyan and then move the kernelspec out
+# to the system share location. Avoids problems with runtime UID change not
+# taking effect properly on the .local folder in the jovyan home dir.
+RUN julia -e 'import Pkg; Pkg.update()' && \
+	(test $TEST_ONLY_BUILD || julia -e 'import Pkg; Pkg.add("HDF5")') && \
+	julia -e "using Pkg; pkg\"add IJulia\"; pkg\"precompile\"" && \
+	# move kernelspec out of home \
+	mv "${HOME}/.local/share/jupyter/kernels/julia"* "${CONDA_DIR}/share/jupyter/kernels/" && \
+	chmod -R go+rx "${CONDA_DIR}/share/jupyter" && \
+	rm -rf "${HOME}/.local" && \
+	fix-permissions "${JULIA_PKGDIR}" "${CONDA_DIR}/share/jupyter"
+
+WORKDIR $HOME
\ No newline at end of file