diff --git a/CHANGELOG.md b/CHANGELOG.md
index 205ba9b7e4b8f3bbe78589712e2e338e5cfb84fc..d7e0fc5a882844b87f6c2d901c67db930330c2de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [(next version)](https://gitlab.cs.uni-duesseldorf.de/api/v4/projects/848/jobs/artifacts/master/raw/build/libs/prob2-jupyter-kernel-1.2.1-SNAPSHOT-all.jar?job=test)
 
+* Added support for Java 17.
 * Updated ProB 2 to version 4.0.0-SNAPSHOT.
 * Added a `:language` command to allow changing the language used to parse user input. For example `:language event_b` can be used to switch to Event-B syntax when a non-Event-B machine is loaded (or no machine at all).
 * Improved the performance of loading machines by reusing the existing instance of ProB instead of starting a new one for each machine.
diff --git a/README.md b/README.md
index 1c95139afd7e26f4895ee96d70882d127503ea1e..90680f28d69c78f6757f8b262ed4009282009a02 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ See the [requirements](#requirements) and [installation instructions](#installat
 ## Requirements
 
 * Java 8 or newer
-	* Tested up to Java 14.
+	* Tested up to Java 17.
 * A Python 3 interpreter with [Jupyter installed](https://jupyter.org/install)
 	* Tested with CPython 3.8 and Jupyter core/Notebook 6.x.
 	* Older Python and Jupyter versions should also work (see below), but if possible please use the current versions of Python and Jupyter.