diff --git a/support/biicode-build.py b/support/biicode-build.py
index 91b2ba27..75cc24b0 100755
--- a/support/biicode-build.py
+++ b/support/biicode-build.py
@@ -11,8 +11,8 @@ cmake_program = 'cmake'
 if os_name == 'linux':
   # Install newer version of CMake.
   cmake_program = bootstrap.install_cmake(
-    'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False,
-    download_dir=None, install_dir=cmake_dir, add_to_path=False)
+    'cmake-3.1.1-Linux-i386.tar.gz', check_installed=False, download_dir=None, install_dir='.')
+  cmake_dir = glob.glob('cmake*')[0]
   with Downloader().download('http://www.biicode.com/downloads/latest/ubuntu64') as f:
     check_call(['sudo', 'dpkg', '-i', f])
 elif os_name == 'osx':
diff --git a/support/bootstrap.py b/support/bootstrap.py
index 5e11eaee..3cab6e11 100644
--- a/support/bootstrap.py
+++ b/support/bootstrap.py
@@ -94,7 +94,7 @@ def install_cmake(package, **kwargs):
   if platform.system() == 'Darwin':
     dir = glob.glob(os.path.join(dir, 'CMake*.app', 'Contents'))[0]
   cmake_path = os.path.join(dir, 'bin', 'cmake')
-  if install_dir != '.' and kwargs.get('add_to_path', True):
+  if install_dir != '.':
     add_to_path(cmake_path)
   return cmake_path