--- a/graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotOptions.java	Sat Jun 06 15:12:58 2015 +0200
+++ b/graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotOptions.java	Sat Jun 06 15:13:09 2015 +0200
@@ -25,7 +25,6 @@
 import java.util.*;
 
 import com.oracle.jvmci.options.*;
-import com.oracle.jvmci.service.*;
 
 //JaCoCo Exclude
 
@@ -42,7 +41,8 @@
      */
     static void printFlags() {
         SortedMap<String, OptionDescriptor> options = new TreeMap<>();
-        for (Options opts : Services.load(Options.class)) {
+
+        for (Options opts : ServiceLoader.load(Options.class, HotSpotOptions.class.getClassLoader())) {
             for (OptionDescriptor desc : opts) {
                 if (isHotSpotOption(desc)) {
                     String name = desc.getName();