diff --git a/interpreter/cling/tools/Jupyter/README.md b/interpreter/cling/tools/Jupyter/README.md
index 218217c91afb4e5ad446885618c27e43345fb191..2001a7c6b055a19c5966856683e549230bd43659 100644
--- a/interpreter/cling/tools/Jupyter/README.md
+++ b/interpreter/cling/tools/Jupyter/README.md
@@ -14,7 +14,10 @@ To install the kernel with sources in src/tools/cling:
     pip install -e .
     # or: pip3 install -e .
 
-    # register the kernelspec for C++14/C++11:
+    # register the kernelspec for C++17/C++14/C++11:
+    # the user can install whichever kernel(s) they
+    # wish:
+    jupyter-kernelspec install [--user] cling-c++17
     jupyter-kernelspec install [--user] cling-c++14
     jupyter-kernelspec install [--user] cling-c++11
 
diff --git a/interpreter/cling/tools/Jupyter/kernel/cling-c++17/kernel.json b/interpreter/cling/tools/Jupyter/kernel/cling-c++17/kernel.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9a711efbaa65fd56a871ee1be72d95a30b854a3
--- /dev/null
+++ b/interpreter/cling/tools/Jupyter/kernel/cling-c++17/kernel.json
@@ -0,0 +1,9 @@
+{
+  "display_name": "C++17",
+  "argv": [
+      "jupyter-cling-kernel",
+      "-f",
+      "{connection_file}",
+      "--std=c++1z"
+  ]
+}
diff --git a/interpreter/cling/tools/Jupyter/kernel/clingkernel.py b/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
index 53cd86c3e29eb589c130bfb1d0abe1ea1adead74..15d4d33c3690460a6f32d593f70ad0fa4f0ade76 100644
--- a/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
+++ b/interpreter/cling/tools/Jupyter/kernel/clingkernel.py
@@ -71,8 +71,8 @@ class ClingKernel(Kernel):
     flush_interval = Float(0.25, config=True)
 
     std = CaselessStrEnum(default_value='c++11',
-            values = ['c++11', 'c++14'],
-            help="C++ standard to use, either c++14 or c++11").tag(config=True);
+            values = ['c++11', 'c++14', 'c++17'],
+            help="C++ standard to use, either c++17, c++14 or c++11").tag(config=True);
 
     def __init__(self, **kwargs):
         super(ClingKernel, self).__init__(**kwargs)