diff --git a/gitiles-servlet/BUCK b/gitiles-servlet/BUCK
index 8f5e3f3..4fa89ab 100644
--- a/gitiles-servlet/BUCK
+++ b/gitiles-servlet/BUCK
@@ -1,10 +1,11 @@
 SRCS = glob(['src/main/java/**/*.java'])
 RSRC = glob(['src/main/resources/**/*'])
 DEPS = [
+  '//lib:commons-lang',
+  '//lib:gson',
   '//lib:guava',
   '//lib:joda-time',
-  '//lib:gson',
-  '//lib:commons-lang',
+  '//lib:jsr305',
   '//lib:prettify',
   '//lib/jgit:jgit',
   '//lib/jgit:jgit-servlet',
@@ -67,7 +68,6 @@
     '//lib/guice:guice_library',
     '//lib/guice:guice-assistedinject',
     '//lib/guice:javax-inject',
-    '//lib/guice:jsr305',
     '//lib/jgit:jgit-archive_library',
     '//lib:servlet-api_2_5',
   ],
diff --git a/lib/BUCK b/lib/BUCK
index 2b66a3f..d0e679d 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -29,6 +29,13 @@
 )
 
 maven_jar(
+  name = 'jsr305',
+  id = 'com.google.code.findbugs:jsr305:3.0.0',
+  sha1 = '5871fb60dc68d67da54a663c3fd636a10a532948',
+  attach_source = False,
+)
+
+maven_jar(
   name = 'gson',
   id = 'com.google.code.gson:gson:2.1',
   sha1 = '2e66da15851f9f5b5079228f856c2f090ba98c38',
diff --git a/lib/guice/BUCK b/lib/guice/BUCK
index eb2a260..15038a9 100644
--- a/lib/guice/BUCK
+++ b/lib/guice/BUCK
@@ -13,7 +13,6 @@
     ':multibindings',
     ':javax-inject',
     ':aopalliance',
-    ':jsr305',
   ],
   visibility = ['PUBLIC'],
 )
@@ -63,10 +62,3 @@
   visibility = ['PUBLIC'],
 )
 
-maven_jar(
-  name = 'jsr305',
-  id = 'com.google.code.findbugs:jsr305:1.3.9',
-  sha1 = '40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf',
-  attach_source = False,
-)
-
diff --git a/lib/soy/BUCK b/lib/soy/BUCK
index 0b2b1c4..21fbd94 100644
--- a/lib/soy/BUCK
+++ b/lib/soy/BUCK
@@ -2,7 +2,10 @@
   name = 'soy',
   id = 'com.google.template:soy:e74fcfa284a1e31d42ac93e53cb84a71f638c70b',
   sha1 = '1c75a007218f29d6124c46c8b18f4158cba4839c',
-  deps = [ ':icu4j' ],
+  deps = [
+    ':icu4j',
+    '//lib:jsr305',
+  ],
   repository = GERRIT,
 )