diff --git a/.buckversion b/.buckversion
index 2fa755d254..561a769f10 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-6e4be2b06238f6dfa07cdc283255b2454d7712c6
+ca8d6cbac373a690f543c5159eec0116e76187a9
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py
index 9fbede3a78..d36e5039b7 100755
--- a/tools/eclipse/project.py
+++ b/tools/eclipse/project.py
@@ -112,7 +112,8 @@ def gen_classpath():
   gwt_lib = set()
   plugins = set()
 
-  java_library = re.compile(r'[^/]+/gen/(.*)/lib__[^/]+__output/[^/]+[.]jar$')
+  # Classpath entries are absolute for cross-cell support
+  java_library = re.compile('.*/buck-out/gen/(.*)/lib__[^/]+__output/[^/]+[.]jar$')
   for p in _query_classpath(MAIN):
     if p.endswith('-src.jar'):
       # gwt_module() depends on -src.jar for Java to JavaScript compiles.