diff --git a/Makefile b/Makefile
index 4b7c37a..2b4370f 100644
--- a/Makefile
+++ b/Makefile
@@ -112,10 +112,10 @@ build.%: | git/poky
 
 	# Append entries to conf/local.conf. Common first, machine second... filter
 	$(Q)$(foreach file,$(CFG_FILES), \
-		cat $(file) | sed s,BASE_DIR,$(PWD), >> $@/conf/local.conf;)
+		cat $(file) | sed s,BASE_DIR,${CURDIR}, >> $@/conf/local.conf;)
 	@echo "require conf/distro/include/sysmocom-defaults.conf" >> $@/conf/local.conf
 
-	$(Q)cat cfg/bblayers.conf | sed  s,BASE_DIR,$(PWD), > $@/conf/bblayers.conf
+	$(Q)cat cfg/bblayers.conf | sed  s,BASE_DIR,${CURDIR}, > $@/conf/bblayers.conf
 
 
 # generic git pull --rebase rule. Let's assume this is matching poky-update