diff --git a/build.java b/build.java
index 9e4aca88..1c4f3115 100644
--- a/build.java
+++ b/build.java
@@ -799,6 +799,9 @@ static void removeDependencies(Tasks.FileReplace.Effects effects, Function<Path,
         final List<String> dependencies = Arrays.asList(
             "truffle:TRUFFLE_NFI",
             "com.oracle.svm.truffle",
+            "com.oracle.svm.truffle.api                   to org.graalvm.truffle",
+            "com.oracle.truffle.api.TruffleLanguage.Provider",
+            "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider",
             "com.oracle.svm.polyglot",
             "truffle:TRUFFLE_API",
             "com.oracle.svm.truffle.nfi",
@@ -1095,7 +1098,7 @@ class Maven
         new SimpleEntry<>("compiler", Path.of("compiler", "mxbuild", "dists", "jdk11", "graal")),
         new SimpleEntry<>("objectfile", Path.of("substratevm", "mxbuild", "dists", "jdk11", "objectfile")),
         new SimpleEntry<>("svm-driver", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-driver")),
-        new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "jvmti-agent-base")),
+        new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk11", "jvmti-agent-base")),
         new SimpleEntry<>("svm-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-agent")),
         new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "svm-diagnostics-agent"))
     );