diff --git a/Makefile b/Makefile
index 39e01f82..a2e95785 100644
--- a/Makefile
+++ b/Makefile
@@ -91,10 +91,10 @@ $(OUT)board-link: $(KCONFIG_CONFIG)
 	$(Q)echo "#$(CONFIG_BOARD_DIRECTORY)" > $@.temp
 	$(Q)if ! cmp -s $@.temp $@; then rm -f $(OUT)*.d $(patsubst %,$(OUT)%/*.d,$(dirs-y)) ; mv $@.temp $@ ; fi
 	$(Q)rm -f $(OUT)board
-	$(Q)ln -sf $(PWD)/src/$(CONFIG_BOARD_DIRECTORY) $(OUT)board
+	$(Q)ln -sf $(CURDIR)/src/$(CONFIG_BOARD_DIRECTORY) $(OUT)board
 	$(Q)mkdir -p $(OUT)board-generic
 	$(Q)rm -f $(OUT)board-generic/board
-	$(Q)ln -sf $(PWD)/src/generic $(OUT)board-generic/board
+	$(Q)ln -sf $(CURDIR)/src/generic $(OUT)board-generic/board
 
 include $(OUT)board-link