diff --git a/website/features/index.html b/website/features/index.html
index 3f00c81a..be853312 100644
--- a/website/features/index.html
+++ b/website/features/index.html
@@ -50,7 +50,9 @@
 		<h3>On javac (and maven, ant, and other build tools)</h3>
 			Include lombok.jar on the classpath as you compile. That's all there is to it!<br />
 			Lombok hosts its own maven repository, so adding lombok to maven is very simple. <a href="/mavenrepo/index.html">full instructions are here</a>.
-		<h3>On GWT (Google Widget Toolkit), javadoc, and other source-based tools</h3>
+		<h3>On GWT (Google Widget Toolkit)</h3>
+			See <a href="../setup/gwt.html">gwt</a> setup.
+		<h3>On javadoc, and other source-based tools</h3>
 			Use <a href="delombok.html">delombok</a> first, then run javadoc or GWT on the delombok-ed code.
 		<h1>Running delombok</h1>
 			<div>Delombok copies your source files to another directory, replacing all lombok annotations with their desugared form. So, it'll turn <code>@Getter</code>
diff --git a/website/setup/gwt.html b/website/setup/gwt.html
index bb4b68a4..f21185f9 100644
--- a/website/setup/gwt.html
+++ b/website/setup/gwt.html
@@ -44,10 +44,10 @@
 			<p>
 			Edit your proj-debug and proj-compile batch scripts to add the following VM arguments:
 			<pre>
-java <strong>-javaagent:lombok.jar=ECJ -Xbootclasspath/p:lombok.jar</strong> -jar gwt.jar <em>(rest of arguments)</em>
+java <strong>-javaagent:lombok.jar=ECJ</strong> <em>(rest of arguments)</em>
 			</pre>
 			<p>
-			Thanks to Stephan Habermann for figuring this out.
+			Thanks to Stephen Haberman for figuring this out.
 		</div>
 		<div class="endBar">
 		</div>