diff --git a/.buckversion b/.buckversion
index c238f697c7..16095d3fb6 100644
--- a/.buckversion
+++ b/.buckversion
@@ -1 +1 @@
-307f5f7155b8abf18097341d58864de1e1d3eb1c
+902da64779068acd3acb5bc193045ee15a34dc85
diff --git a/gerrit-pgm/BUCK b/gerrit-pgm/BUCK
index b34be5c239..2a88694f55 100644
--- a/gerrit-pgm/BUCK
+++ b/gerrit-pgm/BUCK
@@ -40,9 +40,9 @@ java_library2(
     '//gerrit-httpd:httpd',
     '//gerrit-lucene:lucene',
     '//gerrit-openid:openid',
-    '//gerrit-server:common_rules',
     '//gerrit-reviewdb:server',
     '//gerrit-server:server',
+    '//gerrit-server/src/main/prolog:common',
     '//gerrit-solr:solr',
     '//gerrit-sshd:sshd',
     '//gerrit-util-cli:cli',
diff --git a/gerrit-server/BUCK b/gerrit-server/BUCK
index cec2af82e8..c4539f6fef 100644
--- a/gerrit-server/BUCK
+++ b/gerrit-server/BUCK
@@ -1,5 +1,3 @@
-include_defs('//lib/prolog/prolog.defs')
-
 SRCS = glob(['src/main/java/**/*.java'])
 RESOURCES =  glob(['src/main/resources/**/*'])
 
@@ -60,20 +58,13 @@ java_sources(
   visibility = ['PUBLIC'],
 )
 
-prolog_cafe_library(
-  name = 'common_rules',
-  srcs = ['src/main/prolog/gerrit_common.pl'],
-  deps = [':server'],
-  visibility = ['PUBLIC'],
-)
-
 java_test(
   name = 'server_tests',
   srcs = glob(['src/test/java/**/*.java']),
   resources = glob(['src/test/resources/**/*']),
   deps = [
     ':server',
-    ':common_rules',
+    '//gerrit-server/src/main/prolog:common',
     '//gerrit-antlr:query_exception',
     '//gerrit-antlr:query_parser',
     '//gerrit-common:server',
diff --git a/gerrit-server/src/main/prolog/BUCK b/gerrit-server/src/main/prolog/BUCK
new file mode 100644
index 0000000000..09a6553558
--- /dev/null
+++ b/gerrit-server/src/main/prolog/BUCK
@@ -0,0 +1,8 @@
+include_defs('//lib/prolog/prolog.defs')
+
+prolog_cafe_library(
+  name = 'common',
+  srcs = ['gerrit_common.pl'],
+  deps = ['//gerrit-server:server'],
+  visibility = ['PUBLIC'],
+)
diff --git a/gerrit-war/BUCK b/gerrit-war/BUCK
index 0a37f115e2..8d482bba20 100644
--- a/gerrit-war/BUCK
+++ b/gerrit-war/BUCK
@@ -8,8 +8,8 @@ java_library2(
     '//gerrit-lucene:lucene',
     '//gerrit-openid:openid',
     '//gerrit-reviewdb:server',
-    '//gerrit-server:common_rules',
     '//gerrit-server:server',
+    '//gerrit-server/src/main/prolog:common',
     '//gerrit-solr:solr',
     '//gerrit-sshd:sshd',
     '//lib:gwtorm',
diff --git a/lib/prolog/prolog.defs b/lib/prolog/prolog.defs
index e788106e2a..95a75b2cbf 100644
--- a/lib/prolog/prolog.defs
+++ b/lib/prolog/prolog.defs
@@ -19,7 +19,9 @@ def prolog_cafe_library(
     visibility = []):
   genrule(
     name = name + '__pl2j',
-    cmd = '$(exe //lib/prolog:compiler) $SRCS $DEPS $OUT',
+    cmd = 'cd $SRCDIR;$(exe //lib/prolog:compiler) $DEPS ' +
+      ' '.join(srcs) +
+      ' $OUT',
     srcs = srcs,
     deps = ['//lib/prolog:compiler'],
     out = name + '.src.zip',