diff --git a/component/jupyter/buildout.cfg b/component/jupyter/buildout.cfg
index 883ffa3af7a7a3dca8a23af9ed5734babb20debd..e4ae0ea503c73bdf1e642ee7be3169b620804068 100644
--- a/component/jupyter/buildout.cfg
+++ b/component/jupyter/buildout.cfg
@@ -12,6 +12,7 @@ extends =
 
 parts =
   jupyter
+  jupyter-notebook-scripts
 
 [jupyter-env]
 <= numpy-env
@@ -46,3 +47,30 @@ setup-eggs =
   ${numpy:egg}
   ${python-pyzmq:egg}
   ${ipython:egg}
+  
+scripts = 
+  jupyter-kernelspec
+  pythonjupyter
+  jupyter
+  jupyter-trust
+  jupyter-nbconvert
+  jupyter-console
+  jupyter-migrate
+  jupyter-troubleshoot
+  jupyter-run
+  
+[jupyter-notebook-initialized-scripts]
+recipe = zc.recipe.egg:scripts
+eggs = ${jupyter:eggs}
+interpreter = pythonjupyter
+environment = jupyter-env
+
+scripts = 
+  jupyter-nbextension
+  jupyter-notebook
+  jupyter-serverextension
+
+initialization =
+  # https://github.com/ipython/ipython/issues/5420
+  import os
+  os.environ['PYTHONPATH'] = ':'.join(sys.path)
diff --git a/software/jupyter/software.cfg b/software/jupyter/software.cfg
index a762744d19f0136e4b695fef8ef044bd22f7faf8..5ac9c1c344d3f5c02c34e8627e8b0726cfcfd3bf 100644
--- a/software/jupyter/software.cfg
+++ b/software/jupyter/software.cfg
@@ -9,6 +9,7 @@ extends =
 parts =
   slapos-cookbook
   jupyter
+  jupyter-notebook-initialized-scripts
   instance-jupyter-notebook
 
 [jupyter]
diff --git a/software/wendelin/software.cfg b/software/wendelin/software.cfg
index 234526b9a65f302dcd81a2d317aa68013dffa9e7..e5590f34ba26cc127f71cf5f63048c3b71249a0e 100644
--- a/software/wendelin/software.cfg
+++ b/software/wendelin/software.cfg
@@ -12,6 +12,7 @@ parts +=
   ipython
   wendelin.core
   jupyter
+  jupyter-notebook-initialized-scripts
   wendelin_test_suite_runner
   wendelin_testrunner
 
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 62f11543dd328c66dbebae28f6aeea4d993d93d6..28182ef81f44176ca95aeb4ad8b05bee02920a65 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -140,6 +140,7 @@ parts +=
 
 # jupyter
   jupyter
+  jupyter-notebook-initialized-scripts
   instance-jupyter-notebook
 
 # override python2.7 to add SlapOS libstdc++ in RPATH.