diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 50f3c82..66a0470 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,7 +59,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.18.800.v20210503-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.800.v20210524-1800" patch="true"/>
    </requires>
 
    <plugin
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index 7c8f6c4..c601cc9 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -58,11 +58,11 @@
 
 # VERSIONS:
 # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20210503-1800"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20210524-1800"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="I20210503-1800"}
-DROP=${DROPS4}/${DROP:="I20210503-1800"}
+EVERSION=${EVERSION:="I20210524-1800"}
+DROP=${DROPS4}/${DROP:="I20210524-1800"}
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 3bd54f3..fc0e40b 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -25,12 +25,12 @@
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.6.200.v20210416-2027.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.800.v20210503-1800
-jdt.feature.version.next=3.18.800.v20210503-1801
+jdt.feature.version=3.18.800.v20210524-1800
+jdt.feature.version.next=3.18.800.v20210524-1801
 
 # jdt.core fragments for extracting pre-built classes and properties:
 jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.1300.v20210419-1022.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.1100.v20200916-0645.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.1200.v20210521-0550.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD: