diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ TOP:=$(shell readlink -f "../..")
 DISCOVERY:=Utilities/STM32L100C-Discovery
 STMLIB:=libraries
 OLEDDRV:=oleddrv
+USBDRV:=/STM32_USB-FS-Device_Driver/inc
 STD_PERIPH:=$(STMLIB)/STM32L1xx_StdPeriph_Driver
 STARTUP:=$(STMLIB)/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc_ride7
 LINKER_SCRIPT:=$(CURDIR)/stm32-flash.ld
@@ -28,8 +29,8 @@ INCLUDE+=-I$(STMLIB)/$(OLEDDRV)
 # of the same directory as their source files
 vpath %.c $(DISCOVERY) $(STD_PERIPH)/src \
           $(STMLIB)/STM32_USB_OTG_Driver/src \
-          $(STMLIB)/STM32_USB_Device_Library/Class/hid/src \
-          $(STMLIB)/STM32_USB_Device_Library/Core/src
+          $(STMLIB)/STM32_USB-FS_Device_Library/Class/hid/src \
+          $(STMLIB)/STM32_USB-FS_Device_Library/Core/src
 vpath %.s $(STARTUP)
 
 ASRC=startup_stm32l1xx_mdp.s
@@ -61,13 +62,18 @@ SRC+=stm32l1xx_spi.c
 SRC+=stm32l1xx_tim.c
 
 # USB Source Files
-#SRC+=usb_dcd_int.c
-#SRC+=usb_core.c
-#SRC+=usb_dcd.c
-#SRC+=usbd_hid_core.c
-#SRC+=usbd_req.c
-#SRC+=usbd_core.c
-#SRC+=usbd_ioreq.c
+SRC+=usb_core.c
+SRC+=usb_init.c
+SRC+=usb_int.c
+SRC+=usb_mem.c
+SRC+=usb_regs.c
+SRC+=usb_sil.c
+SRC+=hw_config.c
+SRC+=usb_desc.c
+SRC+=usb_endp.c
+SRC+=usb_istr.c
+SRC+=usb_prop.c
+SRC+=usb_pwr.c
 
 CDEFS=-DUSE_STDPERIPH_DRIVER
 CDEFS+=-DSTM32L1XX