diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 2ad1e8108e..b4939b58c6 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -400,7 +400,7 @@ HOST_DEFINES += ARCH_$(HOST_CPU) ;
 HOST_DEFINES += _NO_INLINE_ASM __NO_INLINE__ ;
 
 # for builds of tools in the current environment
-HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) lib ] ;
+HOST_BUILD_COMPATIBILITY_LIB_DIR = [ FDirName $(PWD) $(HOST_OBJECT_BASE_DIR) lib ] ;
 
 # For the generic attributes emulation: Target rm_attrs -- rm replacement that
 # also removes the attributes.
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 8db5d7e8e1..52a7563fac 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -379,9 +379,9 @@ TREE_PATH="$(HAIKU_REPOSITORY_TREE_PATH)"
 TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)"
 
 DOWNLOAD_IN_PORT_DIRECTORY="yes"
-PACKAGE_COMMAND="$(2[1])"
-MIMESET_COMMAND="$(2[2])"
-SYSTEM_MIME_DB="$(2[3])"
+PACKAGE_COMMAND="$(PWD)/$(2[1])"
+MIMESET_COMMAND="$(PWD)/$(2[2])"
+SYSTEM_MIME_DB="$(PWD)/$(2[3])"
 LICENSES_DIRECTORY="$(HAIKU_ABSOLUTE_TOP)/data/system/data/licenses"
 OUTPUT_DIRECTORY="$(HAIKU_REPOSITORY_BUILD_DIRECTORY)"
 EOF