diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb
index 9e4c8b68..222c14ea 100644
--- a/buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/buildserver/cookbooks/android-sdk/recipes/default.rb
@@ -19,14 +19,14 @@ end
 execute "add-android-sdk-path" do
   user user
   path = "#{sdk_loc}/tools:#{sdk_loc}/platform-tools"
-  command "echo \"export PATH=\\$PATH:#{path} #PATH-SDK\" >> /home/#{user}/.bashrc"
-  not_if "grep PATH-SDK /home/#{user}/.bashrc"
+  command "echo \"export PATH=\\$PATH:#{path} #PATH-SDK\" >> /home/#{user}/.bsenv"
+  not_if "grep PATH-SDK /home/#{user}/.bsenv"
 end
 
 execute "add-android-home" do
   user user
-  command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bashrc"
-  not_if "grep ANDROID_HOME /home/#{user}/.bashrc"
+  command "echo \"export ANDROID_HOME=#{sdk_loc}\" >> /home/#{user}/.bsenv"
+  not_if "grep ANDROID_HOME /home/#{user}/.bsenv"
 end
 
 %w{17.0.0 18.0.1}.each do |ver|
diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 03354986..bd977162 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -27,13 +27,18 @@ end
 
 execute "add-gradle-home" do
   user user
-  command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bashrc"
-  not_if "grep GRADLE_HOME /home/#{user}/.bashrc"
+  command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bsenv"
+  not_if "grep GRADLE_HOME /home/#{user}/.bsenv"
 end
 execute "add-gradle-bin" do
   user user
-  command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bashrc"
-  not_if "grep gradle/bin /home/#{user}/.bashrc"
+  command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bsenv"
+  not_if "grep gradle/bin /home/#{user}/.bsenv"
+end
+execute "add-bsenv" do
+  user user
+  command "echo \". ./bsenv \" >> /home/#{user}/.bashrc"
+  not_if "grep bsenv /home/#{user}/.bashrc"
 end
 
 
diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 1cbb935a..a5710da8 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -287,7 +287,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
         if force:
             cmdline += ' --force --test'
         cmdline += ' -p ' + app['id'] + ' --vercode ' + thisbuild['vercode']
-        chan.exec_command(cmdline)
+        chan.exec_command('bash -c ". ~/.bsenv && ' + cmdline + '"')
         output = ''
         error = ''
         while not chan.exit_status_ready():