diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -6,20 +6,18 @@ OPTLVL:=3 # Optimization level, can be [
 
 #PROJECT_NAME:=$(notdir $(lastword $(CURDIR)))
 TOP:=$(shell readlink -f "../..")
-DISCOVERY:=Utilities/STM32L100C-Discovery
 STMLIB:=libraries
 OLEDDRV:=oleddrv
 USBDRV:=USB
-STD_PERIPH:=$(STMLIB)/STM32L1xx_StdPeriph_Driver
-STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc_ride7
+STD_PERIPH:=$(STMLIB)/STM32F0xx_StdPeriph_Driver
+STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc_ride7
 LINKER_SCRIPT:=$(CURDIR)/stm32-flash.ld
 #LINKER_SCRIPT:=$(CURDIR)/../stm32_flash.ld
 
 INCLUDE=-I$(CURDIR)
 INCLUDE+=-I$(STMLIB)/CMSIS/Include
-INCLUDE+=-I$(STMLIB)/CMSIS/Device/ST/STM32L1xx/Include
+INCLUDE+=-I$(STMLIB)/CMSIS/Device/ST/STM32F0xx/Include
 INCLUDE+=-I$(STD_PERIPH)/inc
-INCLUDE+=-I$(DISCOVERY)
 INCLUDE+=-I$(STMLIB)/$(OLEDDRV)
 INCLUDE+=-I$(STMLIB)/$(USBDRV)
 
@@ -31,7 +29,7 @@ vpath %.c $(DISCOVERY) $(STD_PERIPH)/src
           $(STMLIB)/STM32_USB-FS_Device_Library/Core/src
 vpath %.s $(STARTUP)
 
-ASRC=startup_stm32l1xx_mdp.s
+ASRC=startup_stm32f042.s
 
 # Project Source Files
 SRC=main.c
@@ -50,18 +48,18 @@ SRC+=stringhelpers.c
 #SRC+=stm32f4_discovery_audio_codec.c
 
 # Standard Peripheral Source Files
-SRC+=stm32l1xx_syscfg.c
+SRC+=stm32f0xx_syscfg.c
 SRC+=misc.c
-SRC+=stm32l1xx_adc.c
-SRC+=stm32l1xx_dac.c
-SRC+=stm32l1xx_dma.c
-SRC+=stm32l1xx_exti.c
-SRC+=stm32l1xx_flash.c
-SRC+=stm32l1xx_gpio.c
-SRC+=stm32l1xx_i2c.c
-SRC+=stm32l1xx_rcc.c
-SRC+=stm32l1xx_spi.c
-SRC+=stm32l1xx_tim.c
+SRC+=stm32f0xx_adc.c
+SRC+=stm32f0xx_dac.c
+SRC+=stm32f0xx_dma.c
+SRC+=stm32f0xx_exti.c
+SRC+=stm32f0xx_flash.c
+SRC+=stm32f0xx_gpio.c
+SRC+=stm32f0xx_i2c.c
+SRC+=stm32f0xx_rcc.c
+SRC+=stm32f0xx_spi.c
+SRC+=stm32f0xx_tim.c
 
 # USB Source Files
 SRC+=usb_core.c
@@ -78,9 +76,11 @@ SRC+=usb_prop.c
 SRC+=usb_pwr.c
 
 CDEFS=-DUSE_STDPERIPH_DRIVER
-CDEFS+=-DSTM32L1XX
+CDEFS+=-DSTM32F0XX
 CDEFS+=-DMANGUSTA_DISCOVERY
 #CDEFS+=-DUSE_USB_OTG_FS
+
+# EMZ FIXME
 CDEFS+=-DHSE_VALUE=8000000