diff --git a/MANIFEST.in b/MANIFEST.in
index 39560bdda..9a2b6ce55 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -14,4 +14,4 @@ recursive-include splash/lua_modules *.lua *.md *.rst *.txt
 recursive-include splash/tests *.txt *.js *.ini *.lua
 recursive-include splash/vendor/harviewer/webapp *.js *.html *.css *.gif *.png *.swf *.html
 recursive-include splash/kernel/inspections *.json
-recursive-include splash/kernel/kernels *.json
+recursive-include splash/kernel/kernels *.json *.png
diff --git a/dockerfiles/splash-jupyter/Dockerfile b/dockerfiles/splash-jupyter/Dockerfile
index d5a7ce3cd..be369f386 100644
--- a/dockerfiles/splash-jupyter/Dockerfile
+++ b/dockerfiles/splash-jupyter/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -q && \
         libzmq3-dev \
         libsqlite3-dev && \
     pip3 install \
-        ipython[notebook]==4.0.2 && \
+        ipython[notebook]==4.0.3 && \
     apt-get remove -y --purge \
         python3-dev \
         build-essential \
diff --git a/setup.py b/setup.py
index f026c77d6..79469dac7 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,8 @@ def get_version():
         'lua_modules/*.lua',
         'lua_modules/vendor/*.lua',
         'kernel/inspections/*.json',
-        'kernel/kernels/splash/*.json',
+        'kernel/kernels/splash-py2/*.*',
+        'kernel/kernels/splash-py3/*.*',
     ]},
     'zip_safe': False,
     'install_requires': [
diff --git a/splash/kernel/kernel.py b/splash/kernel/kernel.py
index f9f4c76b2..62b0b5c68 100644
--- a/splash/kernel/kernel.py
+++ b/splash/kernel/kernel.py
@@ -30,7 +30,8 @@
 
 def install(user=True):
     """ Install IPython kernel specification """
-    folder = os.path.join(os.path.dirname(__file__), 'kernels', 'splash')
+    name = 'splash-py2' if six.PY2 else 'splash-py3'
+    folder = os.path.join(os.path.dirname(__file__), 'kernels', name)
     install_kernel_spec(folder, kernel_name="splash", user=user, replace=True)
 
 
diff --git a/splash/kernel/kernels/splash/kernel.json b/splash/kernel/kernels/splash-py2/kernel.json
similarity index 100%
rename from splash/kernel/kernels/splash/kernel.json
rename to splash/kernel/kernels/splash-py2/kernel.json
diff --git a/splash/kernel/kernels/splash/logo-32x32.png b/splash/kernel/kernels/splash-py2/logo-32x32.png
similarity index 100%
rename from splash/kernel/kernels/splash/logo-32x32.png
rename to splash/kernel/kernels/splash-py2/logo-32x32.png
diff --git a/splash/kernel/kernels/splash/logo-64x64.png b/splash/kernel/kernels/splash-py2/logo-64x64.png
similarity index 100%
rename from splash/kernel/kernels/splash/logo-64x64.png
rename to splash/kernel/kernels/splash-py2/logo-64x64.png
diff --git a/splash/kernel/kernels/splash-py3/kernel.json b/splash/kernel/kernels/splash-py3/kernel.json
new file mode 100644
index 000000000..931f5bfc2
--- /dev/null
+++ b/splash/kernel/kernels/splash-py3/kernel.json
@@ -0,0 +1,6 @@
+{
+  "argv": ["python3", "-m", "splash.kernel", "-f", "{connection_file}"],
+  "display_name": "Splash",
+  "name": "Splash",
+  "language": "lua"
+}
diff --git a/splash/kernel/kernels/splash-py3/logo-32x32.png b/splash/kernel/kernels/splash-py3/logo-32x32.png
new file mode 100644
index 000000000..3e0cb05f3
Binary files /dev/null and b/splash/kernel/kernels/splash-py3/logo-32x32.png differ
diff --git a/splash/kernel/kernels/splash-py3/logo-64x64.png b/splash/kernel/kernels/splash-py3/logo-64x64.png
new file mode 100644
index 000000000..ec1b874ef
Binary files /dev/null and b/splash/kernel/kernels/splash-py3/logo-64x64.png differ