diff --git a/src/mainboard/siemens/mc_ehl/spd/Makefile.inc b/src/mainboard/siemens/mc_ehl/spd/Makefile.inc
deleted file mode 100644
index 6d9e9087f4..0000000000
--- a/src/mainboard/siemens/mc_ehl/spd/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-## SPDX-License-Identifier: GPL-2.0-only
-
-SPD_SOURCES = mc_ehl	# 0b000
diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc
index 641e814351..e011999940 100644
--- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc
+++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Makefile.inc
@@ -3,3 +3,7 @@
 bootblock-y += gpio.c
 romstage-y += memory.c
 ramstage-y += gpio.c
+
+SPD_SOURCES = mc_ehl1	# 0b000
+LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), \
+			src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex)
diff --git a/src/mainboard/siemens/mc_ehl/spd/empty.spd.hex b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/empty.spd.hex
similarity index 100%
rename from src/mainboard/siemens/mc_ehl/spd/empty.spd.hex
rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/empty.spd.hex
diff --git a/src/mainboard/siemens/mc_ehl/spd/mc_ehl.spd.hex b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/mc_ehl1.spd.hex
similarity index 100%
rename from src/mainboard/siemens/mc_ehl/spd/mc_ehl.spd.hex
rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/mc_ehl1.spd.hex
diff --git a/src/mainboard/siemens/mc_ehl/spd/spd.h b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/spd.h
similarity index 100%
rename from src/mainboard/siemens/mc_ehl/spd/spd.h
rename to src/mainboard/siemens/mc_ehl/variants/mc_ehl1/spd/spd.h