diff --git a/samples/dynatablerf/src/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml b/samples/dynatablerf/src/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml
index 63af732..7f3706d 100644
--- a/samples/dynatablerf/src/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml
+++ b/samples/dynatablerf/src/com/google/gwt/sample/dynatablerf/DynaTableRf.gwt.xml
@@ -32,7 +32,7 @@
   <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
   
   <!-- Uncomment if you are enabling server side deobfuscation of StackTraces
-  <set-property name="compiler.emulatedStack" value="true" />
+  <set-property name="compiler.stackMode" value="emulated" />
   <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" value="true" />
   <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true" />
   -->
diff --git a/user/src/com/google/gwt/benchmarks/Benchmarks.gwt.xml b/user/src/com/google/gwt/benchmarks/Benchmarks.gwt.xml
index cbb5997..e4b9f3c 100644
--- a/user/src/com/google/gwt/benchmarks/Benchmarks.gwt.xml
+++ b/user/src/com/google/gwt/benchmarks/Benchmarks.gwt.xml
@@ -26,7 +26,7 @@
 
   <!-- We do not want stack traces. -->
   <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="false" />
-  <set-property name="compiler.emulatedStack" value="false" />
+  <set-property name="compiler.stackMode" value="native" />
   
   <generate-with class="com.google.gwt.benchmarks.rebind.BenchmarkGenerator">
     <when-type-assignable class="com.google.gwt.benchmarks.client.Benchmark"/>
diff --git a/user/src/com/google/gwt/junit/JUnit.gwt.xml b/user/src/com/google/gwt/junit/JUnit.gwt.xml
index 000ed09..6067043 100644
--- a/user/src/com/google/gwt/junit/JUnit.gwt.xml
+++ b/user/src/com/google/gwt/junit/JUnit.gwt.xml
@@ -33,7 +33,7 @@
 
   <!-- We want to provide consistent stack traces across all browsers. -->
   <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true" />
-  <set-property name="compiler.emulatedStack" value="true" />
+  <set-property name="compiler.stackMode" value="emulated" />
 
   <!-- Override the regular symbolMaps linker to put the data somewhere we can find it -->
   <define-linker name="symbolMaps" class="com.google.gwt.junit.linker.JUnitSymbolMapsLinker" />
diff --git a/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java b/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
index cbc6337..7379425 100644
--- a/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
+++ b/user/src/com/google/gwt/logging/server/StackTraceDeobfuscator.java
@@ -31,7 +31,7 @@
 /**
  * Deobfuscates stack traces on the server side. This class requires that you
  * have turned on emulated stack traces, via
- * <code>&lt;set-property name="compiler.emulatedStack" value="true" /&gt;</code>
+ * <code>&lt;set-property name="compiler.stackMode" value="emulated" /&gt;</code>
  * in your <code>.gwt.xml</code> module file, and moved your symbol map files to
  * a location accessible by your server sever side code. You can use the GWT
  * compiler <code>-deploy</code> command line argument to specify the location