diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml
index 70c57400ac..bb0da11644 100644
--- a/gerrit-gwtui/pom.xml
+++ b/gerrit-gwtui/pom.xml
@@ -135,6 +135,19 @@ limitations under the License.
       <classifier>sources</classifier>
       <type>jar</type>
     </dependency>
+
+    <!-- GWT should require these itself, but doesn't. -->
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.validation</groupId>
+      <artifactId>validation-api</artifactId>
+      <classifier>sources</classifier>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
index d3d990ccab..8555c75d66 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
@@ -32,6 +32,7 @@
   <extend-property name='locale' values='en'/>
   <set-property-fallback name='locale' value='en'/>
   <set-property name='locale' value='en'/>
+  <set-configuration-property name='UiBinder.useSafeHtmlTemplates' value='true'/>
 
   <entry-point class='com.google.gerrit.client.Gerrit'/>
 </module>
diff --git a/pom.xml b/pom.xml
index 39c6bcc1c7..03e98302b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,9 @@ limitations under the License.
   <properties>
     <jgitVersion>0.12.1.53-g5ec4977</jgitVersion>
     <gwtormVersion>1.1.4</gwtormVersion>
-    <gwtjsonrpcVersion>1.2.4</gwtjsonrpcVersion>
+    <gwtjsonrpcVersion>1.2.5</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.2.3</gwtexpuiVersion>
-    <gwtVersion>2.1.1</gwtVersion>
+    <gwtVersion>2.3.0</gwtVersion>
     <slf4jVersion>1.6.1</slf4jVersion>
     <guiceVersion>2.0</guiceVersion>
     <jettyVersion>7.2.1.v20101111</jettyVersion>
@@ -361,7 +361,7 @@ limitations under the License.
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>gwt-maven-plugin</artifactId>
-          <version>2.1.0-1</version>
+          <version>2.3.0</version>
         </plugin>
 
         <plugin>
@@ -500,6 +500,20 @@ limitations under the License.
         <version>2.0.16</version>
       </dependency>
 
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.0.0.GA</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.0.0.GA</version>
+        <classifier>sources</classifier>
+        <scope>provided</scope>
+      </dependency>
+
       <dependency>
         <groupId>com.google.code.guice</groupId>
         <artifactId>guice</artifactId>