--- old/src/share/vm/runtime/arguments.cpp	2013-03-18 10:49:07.325736119 +0100
+++ new/src/share/vm/runtime/arguments.cpp	2013-03-18 10:49:07.141736122 +0100
@@ -1208,9 +1208,6 @@
 
     // Code along this path potentially sets NewSize and OldSize
 
-    assert(max_heap >= InitialHeapSize, "Error");
-    assert(max_heap >= NewSize, "Error");
-
     if (PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
       tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
@@ -2342,7 +2339,7 @@
       FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
       FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
     // -Xms
-    } else if (match_option(option, "-Xms", &tail)) {
+    } else if (match_option(option, "-Xms", &tail) || match_option(option, "-XX:InitialHeapSize=", &tail)) {
       julong long_initial_heap_size = 0;
       ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 1);
       if (errcode != arg_in_range) {
@@ -2355,7 +2352,7 @@
       // Currently the minimum size and the initial heap sizes are the same.
       set_min_heap_size(InitialHeapSize);
     // -Xmx
-    } else if (match_option(option, "-Xmx", &tail)) {
+    } else if (match_option(option, "-Xmx", &tail) || match_option(option, "-XX:MaxHeapSize=", &tail)) {
       julong long_max_heap_size = 0;
       ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
       if (errcode != arg_in_range) {