diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 7700318278..34ac2440c4 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -483,7 +483,7 @@ rule FetchPackage packageName : flags
 {
 	local foundPackageName = [ IsPackageAvailable $(packageName) : $(flags) ] ;
 	if ! $(foundPackageName) {
-		Exit "DownloadPackage: package" $(packageName) "not available!" ;
+		Exit "FetchPackage: package" $(packageName) "not available!" ;
 		return ;
 	}
 	packageName = $(foundPackageName) ;
@@ -497,6 +497,12 @@ rule FetchPackage packageName : flags
 	local fileName = [ on $(package) return $(HAIKU_PACKAGE_FILE_NAME) ] ;
 	local repository = [ on $(package) return $(HAIKU_PACKAGE_REPOSITORY) ] ;
 
+	if $(HAIKU_DONT_FETCH_PACKAGES) {
+		Exit "FetchPackage: file" $(fileName) "not found and fetching"
+			"disabled!" ;
+		return ;
+	}
+
 	return [ InvokeRepositoryMethod $(repository) : FetchPackage : $(package)
 		: $(fileName) ] ;
 }