diff --git a/python/catkin/builder.py b/python/catkin/builder.py
index 921e6141e..8799bce33 100644
--- a/python/catkin/builder.py
+++ b/python/catkin/builder.py
@@ -295,7 +295,11 @@ def build_catkin_package(
     )
 
     # Make the build dir
-    build_dir = _check_build_dir(package.name, workspace, buildspace)
+    if install:
+        build_dir_name = '%s_install' % package.name
+    else:
+        build_dir_name = '%s_devel' % package.name
+    build_dir = _check_build_dir(build_dir_name, workspace, buildspace)
 
     # Check last_env
     if last_env is not None: