diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle
index 445714e61ab..991e7a7c26d 100644
--- a/elasticsearch/build.gradle
+++ b/elasticsearch/build.gradle
@@ -14,5 +14,5 @@ subprojects {
     approvedLicenses = ['Elasticsearch Confidential']
     additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
   }
-  ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-client:${version}": ':x-plugins:elasticsearch:x-pack' ]
+  ext.projectSubstitutions += [ "org.elasticsearch.plugin:x-pack-api:${version}": ':x-plugins:elasticsearch:x-pack' ]
 }
diff --git a/elasticsearch/x-pack-transport/build.gradle b/elasticsearch/x-pack-transport/build.gradle
index b15422a2011..b1150749d9b 100644
--- a/elasticsearch/x-pack-transport/build.gradle
+++ b/elasticsearch/x-pack-transport/build.gradle
@@ -7,7 +7,9 @@ apply plugin: 'nebula.maven-scm'
 group = 'org.elasticsearch.client'
 
 dependencies {
-    compile "org.elasticsearch.plugin:x-pack-client:${version}"
+    // this "api" dependency looks weird, but it is correct, as it contains
+    // all of x-pack for now, and transport client will be going away in the future. 
+    compile "org.elasticsearch.plugin:x-pack-api:${version}"
     compile "org.elasticsearch.client:transport:${version}"
     testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
     testCompile "junit:junit:${versions.junit}"
diff --git a/elasticsearch/x-pack/build.gradle b/elasticsearch/x-pack/build.gradle
index 72a5870f092..75546a85131 100644
--- a/elasticsearch/x-pack/build.gradle
+++ b/elasticsearch/x-pack/build.gradle
@@ -12,7 +12,6 @@ esplugin {
   name 'x-pack'
   description 'Elasticsearch Expanded Pack Plugin'
   classname 'org.elasticsearch.xpack.XPackPlugin'
-  hasClientJar = true
 }
 
 ext.versions = [