diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index dea678d2d24f64c7c80569ee4faf4c79e6560efc..7ef5658ea04e07813b249c152edd6141e56bf7de 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -395,16 +395,18 @@ task zipDss(type: Zip, dependsOn: signWebStartJars) {
 }
 
 task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, proteomicsApiZip, screeningApiZip]) {
-  def pybisVersion = '1.4.1'
   baseName 'openBIS-clients-and-APIs'
-  downloadFile("https://sissource.ethz.ch/sispub/pybis/repository/release/${pybisVersion}/archive.zip", "pybis-${pybisVersion}.zip")
-  from "targets/downloads/pybis-${pybisVersion}.zip"
+  downloadFile("https://sissource.ethz.ch/sispub/pybis/repository/master/archive.zip", "pybis.zip")
+  from "targets/downloads/pybis.zip"
   from dssClientZip.archivePath
   from queryApiZip.archivePath
   from apiV3Zip.archivePath
   from proteomicsApiZip.archivePath
   from screeningApiZip.archivePath
   from ('../openbis_all/dist/readme.txt')
+  def contentOfSetUpFile = zipTree('targets/downloads/pybis.zip').getFiles().findAll {it.path.endsWith('PyBis/setup.py') }.iterator().next().text
+  def pybisVersion = ( contentOfSetUpFile =~ /version.*=.*'(.*)'/)[0][1]
+  rename 'pybis.zip', "pybis-${pybisVersion}.zip"
 }
 
 task generateJavadoc(type: Javadoc) {