diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index d5d245066f..fb91089c19 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -43,7 +43,7 @@ rule AddRepositoryPackage repository : architecture : baseName : version
 		: $(baseName) ] ;
 	baseName = $(packageFamily:G=) ;
 
-	if $(HAIKU_NO_DOWNLOADS) = 1 && $(HAIKU_BUILD_TYPE) != bootstrap {
+	if $(HAIKU_NO_DOWNLOADS) = 1 && $(HAIKU_IS_BOOTSTRAP) != 1 {
 		# Only add packages to repository that already exist in download
 		# directory.
 		if ! [ Glob $(HAIKU_DOWNLOAD_DIR) : $(packageFileName) ] {
diff --git a/configure b/configure
index a5b4acd9d6..c5aaf3050b 100755
--- a/configure
+++ b/configure
@@ -451,6 +451,7 @@ HOST_SHA256=
 HOST_HAIKU_PORTER=
 HAIKU_PORTS=
 HAIKU_PORTS_CROSS=
+HAIKU_IS_BOOTSTRAP=0
 HAIKU_BOOT_BOARD=
 HAIKU_NO_DOWNLOADS=0
 
@@ -524,6 +525,8 @@ while [ $# -gt 0 ] ; do
 			HOST_HAIKU_PORTER="`absolute_path $2`"
 			HAIKU_PORTS_CROSS="`absolute_path $3`"
 			HAIKU_PORTS="`absolute_path $4`"
+			HAIKU_IS_BOOTSTRAP=1
+			HAIKU_NO_DOWNLOADS=1
 			check_file_exists "$HOST_HAIKU_PORTER" || (
 				echo "Invalid path to haikuporter: $HOST_HAIKU_PORTER" >&2
 				exit 1
@@ -882,6 +885,7 @@ HOST_SHA256					?= ${HOST_SHA256} ;
 HOST_HAIKU_PORTER			?= ${HOST_HAIKU_PORTER} ;
 HAIKU_PORTS					?= ${HAIKU_PORTS} ;
 HAIKU_PORTS_CROSS			?= ${HAIKU_PORTS_CROSS} ;
+HAIKU_IS_BOOTSTRAP			?= ${HAIKU_IS_BOOTSTRAP} ;
 
 EOF