--- a/hotspot/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Mon May 22 09:07:16 2017 -0700
+++ b/hotspot/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Thu May 25 15:27:40 2017 -0700
@@ -594,6 +594,15 @@
       "workingSets" : "Graal,LIR,SPARC",
     },
 
+    "org.graalvm.api.word" : {
+      "subDir" : "share/classes",
+      "sourceDirs" : ["src"],
+      "dependencies" : [],
+      "checkstyle" : "org.graalvm.compiler.graph",
+      "javaCompliance" : "1.8",
+      "workingSets" : "API",
+    },
+
     "org.graalvm.compiler.word" : {
       "subDir" : "share/classes",
       "sourceDirs" : ["src"],
@@ -703,7 +712,6 @@
         "org.graalvm.compiler.bytecode",
         "org.graalvm.compiler.lir",
       ],
-      "generatedDependencies" : ["org.graalvm.compiler.serviceprovider"],
       "checkstyle" : "org.graalvm.compiler.graph",
       "javaCompliance" : "1.8",
       "annotationProcessors" : [
@@ -950,6 +958,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "org.graalvm.compiler.debug",
+        "org.graalvm.api.word",
       ],
       "annotationProcessors" : ["GRAAL_OPTIONS_PROCESSOR"],
       "checkstyle" : "org.graalvm.compiler.graph",