diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ LIBDIR:=libraries
 HAL_LIB:=$(LIBDIR)/STM32F0xx_HAL_Driver
 USB_LIB:=$(LIBDIR)/STM32_USB_Device_Library
 
-STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc_ride7
+STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc
 
 LINKER_SCRIPT:=$(CURDIR)/stm32-flash.ld
 
@@ -31,22 +31,24 @@ INCLUDE+=-I$(HAL_LIB)/Inc
 
 # vpath is used so object files are written to the current directory instead
 # of the same directory as their source files
-vpath %.c $(DISCOVERY) $(STD_PERIPH)/src \
-          $(STMLIB)/USB \
-          $(STMLIB)/STM32_USB-FS_Device_Library/Class/hid/src \
-          $(STMLIB)/STM32_USB-FS_Device_Library/Core/src
+vpath %.c $(HAL_LIB)/src \
+          $(LIBDIR)/$(USB_LIB) \
+          $(LIBDIR)/$(USB_LIB)/Class/CDC \
+          $(LIBDIR)/$(USB_LIB)/Core
 vpath %.s $(STARTUP)
 
-ASRC=startup_stm32f042.s
+ASRC=startup_stm32f042x6.s
 
 # Project Source Files
 SRC=main.c
 SRC+=stm32f0xx_it.c
+SRC+=stm32f0xx_hal_msp.c
 SRC+=system_stm32f0xx.c
 SRC+=ssd1306.c
 SRC+=eeprom_min.c
 SRC+=gpio.c
 SRC+=spi.c
+SRC+=clock.c
 SRC+=stringhelpers.c
 
 # Discovery Source Files