diff --git a/Makefile b/Makefile
index ef0cbd411470..df40541d1f04 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,10 @@ tftf: build_bin
                --no-hamming-balance \
                --start 0x`grep '\bReset_Handler$$' $(NUTTX_BUILDBASE)/image/System.map | cut -d ' ' -f 1`

+set_vid_pid:
+       echo "CONFIG_ARA_MODULE_VID=$(vendor_id)" >> $(BUILDBASE)/config
+       echo "CONFIG_ARA_MODULE_PID=$(product_id)" >> $(BUILDBASE)/config
+
 tftf_mkoutput:
        echo "creating tftf output directory: $(TFTFDIR)"
        mkdir -p $(TFTFDIR)
@@ -104,7 +108,7 @@ cp_source: tftf_mkoutput
        echo "copying module source to build directory: $(BUILDBASE)"
        cp -r $(MODULE_PATH)/* $(BUILDBASE)

-build_bin: cp_source
+build_bin: cp_source set_vid_pid
        echo "starting firmware build"
        $(SCRIPTPATH)/build.sh