diff --git a/bsp/ar71xx-tiny.bsp b/bsp/ar71xx-tiny.bsp
index 0cf426c0..aa2c86e3 100644
--- a/bsp/ar71xx-tiny.bsp
+++ b/bsp/ar71xx-tiny.bsp
@@ -1,4 +1,3 @@
-machine=ar71xx-tiny
 chipset=ar71xx
 subtarget=tiny
 images=("openwrt-${chipset}-${subtarget}-archer-c25-v1-squashfs-*"
diff --git a/bsp/ipq806x-generic.bsp b/bsp/ipq806x-generic.bsp
index 405f8d0b..b626af28 100644
--- a/bsp/ipq806x-generic.bsp
+++ b/bsp/ipq806x-generic.bsp
@@ -1,4 +1,3 @@
-machine=ipq806x-generic
 chipset=ipq806x
 subtarget=generic
 
diff --git a/bsp/mpc85xx-generic.bsp b/bsp/mpc85xx-generic.bsp
index 1d3658f2..ce642c16 100644
--- a/bsp/mpc85xx-generic.bsp
+++ b/bsp/mpc85xx-generic.bsp
@@ -1,4 +1,3 @@
-machine=mpc85xx-generic
 chipset=mpc85xx
 subtarget=generic
 
diff --git a/bsp/ramips-mt7621.bsp b/bsp/ramips-mt7621.bsp
index 8a5c69e2..7cff37d6 100644
--- a/bsp/ramips-mt7621.bsp
+++ b/bsp/ramips-mt7621.bsp
@@ -1,4 +1,3 @@
-machine=mt7621-generic
 chipset=ramips
 subtarget=mt7621
 
diff --git a/bsp/ramips-mt76x8.bsp b/bsp/ramips-mt76x8.bsp
index ee9d1c3f..81cf9d29 100644
--- a/bsp/ramips-mt76x8.bsp
+++ b/bsp/ramips-mt76x8.bsp
@@ -1,4 +1,3 @@
-machine=ramips-mt76x8
 chipset=ramips
 subtarget=mt76x8
 images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-*"
diff --git a/buildscript b/buildscript
index d4e739dd..1f922910 100755
--- a/buildscript
+++ b/buildscript
@@ -362,6 +362,7 @@ loadBSP()
 {
     echo "Working with $(/bin/ls -l selected_bsp | awk '{ print $11 }')"
     . selected_bsp
+    machine=$(basename $(realpath selected_bsp) .bsp)
 }
 
 loadVariant()