diff -r aed758eda82a -r 11fb740ce98f src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Sep 07 12:04:16 2012 -0400
+++ b/src/share/vm/runtime/globals.hpp	Fri Sep 07 16:42:25 2012 -0400
@@ -2993,7 +2993,7 @@
   product(uintx, MaxMetaspaceSize, max_uintx,                               \
           "Maximum size of Metaspaces (in bytes)")                          \
                                                                             \
-  product(uintx, ClassMetaspaceSize, NOT_LP64(1*M) LP64_ONLY(512*M),        \
+  product(uintx, ClassMetaspaceSize, 2*M,                                   \
           "Maximum size of InstanceKlass area in Metaspace used for "       \
           "UseCompressedKlassPointers")                                     \
                                                                             \