--- old/src/share/vm/runtime/arguments.cpp	2015-06-23 11:21:58.604245103 +0200
+++ new/src/share/vm/runtime/arguments.cpp	2015-06-23 11:21:58.472244448 +0200
@@ -1535,7 +1535,11 @@
     if (should_auto_select_low_pause_collector()) {
       FLAG_SET_ERGO(bool, UseConcMarkSweepGC, true);
     } else {
+#if defined(JAVASE_EMBEDDED)
       FLAG_SET_ERGO(bool, UseParallelGC, true);
+#else
+      FLAG_SET_ERGO(bool, UseG1GC, true);
+#endif
     }
   } else {
     FLAG_SET_ERGO(bool, UseSerialGC, true);