diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99305dd80..24d3d2463 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ CMAKE_DEPENDENT_OPTION(I450KX "Intel i450KX" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(LASERXT "VTech Laser XT" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(MGA "Matrox Mystique graphics adapters" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(NO_SIO "Machines without emulated Super I/O chips" ON "DEV_BRANCH" OFF)
+CMAKE_DEPENDENT_OPTION(OLIVETTI "Olivetti M290" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(OPEN_AT "OpenAT" ON "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(PAS16 "Pro Audio Spectrum 16" OFF "DEV_BRANCH" OFF)
 CMAKE_DEPENDENT_OPTION(PS2M70T4 "IBM PS/2 model 70 (type 4)" ON "DEV_BRANCH" OFF)
diff --git a/src/chipset/CMakeLists.txt b/src/chipset/CMakeLists.txt
index fc06eb1f8..1fb71f0d6 100644
--- a/src/chipset/CMakeLists.txt
+++ b/src/chipset/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(chipset OBJECT acc2168.c cs8230.c ali1217.c ali1429.c ali1489.c head
 	sis_85c310.c sis_85c4xx.c sis_85c496.c sis_85c50x.c sis_5511.c sis_5571.c sis_5598.c
 	umc_8886.c umc_8890.c umc_hb4.c
 	via_vt82c49x.c via_vt82c505.c sis_85c310.c sis_85c4xx.c sis_85c496.c sis_85c50x.c
-	gc100.c olivetti_eva.c stpc.c 
+	gc100.c stpc.c 
 	via_apollo.c via_pipc.c wd76c10.c
 	vl82c480.c)
 
@@ -34,4 +34,8 @@ endif()
 
 if(M6117)
 	target_sources(chipset PRIVATE ali6117.c)
+endif()
+
+if(OLIVETTI)
+	target_sources(chipset PRIVATE olivetti_eva.c)
 endif()
\ No newline at end of file
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index e9d4abeea..4f719af2f 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -569,6 +569,7 @@ endif
 
 ifeq ($(OLIVETTI), y)
 OPTS		+= -DUSE_OLIVETTI
+DEVBROBJ	+= olivetti_eva.o
 endif
 
 
@@ -604,7 +605,7 @@ CPUOBJ		:= cpu.o cpu_table.o fpu.o x86.o \
 CHIPSETOBJ	:= acc2168.o cs8230.o ali1217.o ali1429.o ali1489.o headland.o intel_82335.o cs4031.o \
 		    intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
 		    neat.o opti495.o opti822.o opti895.o opti5x7.o scamp.o scat.o via_vt82c49x.o via_vt82c505.o \
-		    gc100.o olivetti_eva.o \
+		    gc100.o \
 		    sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o sis_5511.o sis_5571.o sis_5598.o stpc.o opti283.o opti291.o \
 		    umc_8886.o umc_8890.o umc_hb4.o \
 		    via_apollo.o via_pipc.o wd76c10.o vl82c480.o