diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java
index e14f057949e7977accd1e0df55d98abeddddabeb..6c9c0d2e383849f75071977c6290842b182fa04b 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/repl/RREPLServer.java
@@ -122,7 +122,7 @@ public final class RREPLServer extends REPLServer {
         System.arraycopy(args, 0, debugArgs, 1, args.length);
         RCmdOptions options = RCmdOptions.parseArguments(RCmdOptions.Client.R, args);
         ContextInfo info = RCommand.createContextInfoFromCommandLine(options);
-        this.vm = info.apply(PolyglotEngine.buildNew()).onEvent(onHalted).onEvent(onExec).build();
+        this.vm = info.apply(PolyglotEngine.newBuilder()).onEvent(onHalted).onEvent(onExec).build();
         this.language = vm.getLanguages().get(TruffleRLanguage.MIME);
         assert language != null;
 
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java
index 91126684fd42fcf8e5e99a95265350aa08d40c28..19961349dedc26c716631010d7350a4ce397c3de 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java
@@ -179,7 +179,7 @@ public class RCommand {
      * exiting. So,in either case, we never return.
      */
     public static void readEvalPrint(ContextInfo info) {
-        PolyglotEngine vm = info.apply(PolyglotEngine.buildNew()).build();
+        PolyglotEngine vm = info.apply(PolyglotEngine.newBuilder()).build();
         ConsoleHandler consoleHandler = info.getConsoleHandler();
         Source source = Source.fromNamedAppendableText(consoleHandler.getInputDescription());
         try {
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java
index 095fbf8fde280ddbfd14bf1dd802e5886c13ce48..f1171c7265d58e85e0eba9cdbd37967b3c7585b7 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/fastr/FastRContext.java
@@ -139,7 +139,7 @@ public class FastRContext {
             } else {
                 for (int i = 0; i < contexts.getLength(); i++) {
                     ContextInfo info = checkContext(contexts.getDataAt(i), this);
-                    PolyglotEngine vm = info.apply(PolyglotEngine.buildNew()).build();
+                    PolyglotEngine vm = info.apply(PolyglotEngine.newBuilder()).build();
                     try {
                         Source source = Source.fromText(exprs.getDataAt(i), "<eval>").withMimeType(RRuntime.R_APP_MIME);
                         vm.eval(source);
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
index 79d82950d4eece74d1f3ac64dc5cf4b9ed78095c..4c5a25d191d92b372539bbc7111714f5c3ecd405 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java
@@ -123,7 +123,7 @@ public final class FastRSession implements RSession {
         create();
         RCmdOptions options = RCmdOptions.parseArguments(Client.RSCRIPT, new String[0]);
         ContextInfo info = ContextInfo.create(options, ContextKind.SHARE_PARENT_RW, mainContext, consoleHandler, TimeZone.getTimeZone("CET"));
-        return info.apply(PolyglotEngine.buildNew()).build();
+        return info.apply(PolyglotEngine.newBuilder()).build();
     }
 
     private FastRSession() {
@@ -131,7 +131,7 @@ public final class FastRSession implements RSession {
         try {
             RCmdOptions options = RCmdOptions.parseArguments(Client.RSCRIPT, new String[0]);
             ContextInfo info = ContextInfo.create(options, ContextKind.SHARE_NOTHING, null, consoleHandler);
-            main = info.apply(PolyglotEngine.buildNew()).build();
+            main = info.apply(PolyglotEngine.newBuilder()).build();
             try {
                 mainContext = main.eval(GET_CONTEXT).as(RContext.class);
             } catch (IOException e) {
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java
index 69e1b5cb300911b2cc0d9597c45e9e1af67b19ce..f0b96ac4cff734259fa6904f5bfebcc35d3e7638 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRTckTest.java
@@ -34,7 +34,7 @@ import com.oracle.truffle.tck.TruffleTCK;
 public class FastRTckTest extends TruffleTCK {
     @Test
     public void testVerifyPresence() {
-        PolyglotEngine vm = PolyglotEngine.buildNew().build();
+        PolyglotEngine vm = PolyglotEngine.newBuilder().build();
         assertTrue("Our language is present", vm.getLanguages().containsKey("text/x-r"));
     }
 
@@ -71,7 +71,7 @@ public class FastRTckTest extends TruffleTCK {
 
     @Override
     protected PolyglotEngine prepareVM() throws Exception {
-        PolyglotEngine vm = PolyglotEngine.buildNew().build();
+        PolyglotEngine vm = PolyglotEngine.newBuilder().build();
         vm.eval(INITIALIZATION);
         return vm;
     }
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index b618bf2f4d618a49cd129d5a54c9ec106764939a..17f235d99d43383b0d339235f37fd6b451daeff4 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -23,6 +23,7 @@
 suite = {
   "mxversion" : "5.6.1",
   "name" : "fastr",
+  "versionConflictResolution" : "latest",
   "imports" : {
     "suites" : [
             {
@@ -30,6 +31,14 @@ suite = {
                "version" : "d6f0245476e26f823d723d21b996eba0a069771b",
                "urls" : [{"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"}]
             },
+            {
+               "name" : "truffle",
+               "version" : "d099f8650cfb4c74ee9e8268726a254e282f1092",
+               "urls" : [
+                    {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/truffle", "kind" : "hg"},
+                    {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},
+                ]
+            },
         ],
    },