diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 462bc4df3b..d933dae51a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -312,7 +312,7 @@ configure_file(version.h.in version.h)
 add_custom_command(
     OUTPUT  ${SWIPL_BOOT_FILE}
     COMMAND ${CMAKE_COMMAND} -E remove -f ${SWIPL_BOOT_FILE}
-    COMMAND ${PROG_SWIPL_FOR_BOOT} -q -O -o ${SWIPL_BOOT_FILE}
+    COMMAND ${PROG_SWIPL_FOR_BOOT} --home=${SWIPL_BUILD_HOME} -q -O -o ${SWIPL_BOOT_FILE}
 				   -b ${SWIPL_BUILD_HOME}/boot/init.pl
     DEPENDS ${DEP_SWIPL_FOR_BOOT} ${SWIPL_BOOT_FILES}
 )
diff --git a/src/pl-init.c b/src/pl-init.c
index b4a561cec9..c9ae6ceaac 100644
--- a/src/pl-init.c
+++ b/src/pl-init.c
@@ -515,6 +515,18 @@ searchHome(const char *symbols, bool verbose)
   }
 }
 
+static bool
+is_boot_session(int argc, const char **argv)
+{ for(int i=0; i<argc && argv[i]; i++)
+  { if ( strcmp(argv[i], "-b") == 0 )
+      return true;
+    if ( strcmp(argv[i], "--") == 0 )
+      break;
+  }
+
+  return false;
+}
+
 static char *
 findHome(const char *symbols, int argc, const char **argv)
 { char *home = NULL;
@@ -529,7 +541,7 @@ findHome(const char *symbols, int argc, const char **argv)
 	 (home=AbsoluteFile(home, plp, sizeof(plp))) )
     { home = store_string(home);
       int rc = check_home(home);
-      if ( rc < 0 )
+      if ( rc < 0 && !is_boot_session(argc, argv) )
 	warn_bad_home("WARNING: Invalid SWI-Prolog home directory ", home, rc);
       return home;
     } else