diff --git a/gitiles-dev/BUCK b/gitiles-dev/BUCK
index 0ab7c53..fe841a8 100644
--- a/gitiles-dev/BUCK
+++ b/gitiles-dev/BUCK
@@ -4,14 +4,14 @@
   deps = [
     '//gitiles-servlet:servlet',
     '//lib:guava',
+    '//lib:servlet-api_3_0',
     '//lib/jgit:jgit',
     '//lib/jgit:jgit-servlet',
     '//lib/jetty:server',
     '//lib/jetty:servlet',
     '//lib/slf4j:slf4j-api',
     '//lib/slf4j:slf4j-simple',
-    '//lib:servlet-api_3_0',
-    '//lib:soy',
+    '//lib/soy:soy',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/gitiles-servlet/BUCK b/gitiles-servlet/BUCK
index 8ff8035..217075b 100644
--- a/gitiles-servlet/BUCK
+++ b/gitiles-servlet/BUCK
@@ -5,7 +5,6 @@
 RSRC = glob(['src/main/resources/**/*'])
 DEPS = [
   '//lib:guava',
-  '//lib:soy',
   '//lib:joda-time',
   '//lib:gson',
   '//lib:commons-lang',
@@ -13,6 +12,7 @@
   '//lib/jgit:jgit',
   '//lib/jgit:jgit-servlet',
   '//lib/slf4j:slf4j-api',
+  '//lib/soy:soy',
 ]
 
 DEPS_ALL = DEPS + [
diff --git a/lib/BUCK b/lib/BUCK
index abed916..a5f03b0 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -7,12 +7,6 @@
 )
 
 maven_jar(
-  name = 'soy',
-  id = 'com.google.template:soy:2012-12-21',
-  sha1 = 'cc28da103845a0f08cfd3fa5abdd45899b0adae1',
-)
-
-maven_jar(
   name = 'servlet-api_2_5',
   id = 'org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518',
   sha1 = '9c16011c06bc6fe5e9dba080fcb40ddb4b75dc85',
diff --git a/lib/soy/BUCK b/lib/soy/BUCK
new file mode 100644
index 0000000..f97bdc0
--- /dev/null
+++ b/lib/soy/BUCK
@@ -0,0 +1,17 @@
+include_defs('//bucklets/maven_jar.bucklet')
+
+maven_jar(
+  name = 'soy',
+  id = 'com.google.template:soy:2014-04-22',
+  sha1 = 'd0b78ae3ab2283cdeae1a3b2f1fc5b7155a7305d',
+  deps = [
+    ':icu4j',
+  ],
+  repository = GERRIT,
+)
+
+maven_jar(
+  name = 'icu4j',
+  id = 'com.ibm.icu:icu4j:51.1',
+  sha1 = '8ce396c4aed83c0c3de9158dc72c834fd283d5a4',
+)