diff --git a/include/libopencm3/stm32/l4/memorymap.h b/include/libopencm3/stm32/l4/memorymap.h
index baaa32f5..7d0f310b 100644
--- a/include/libopencm3/stm32/l4/memorymap.h
+++ b/include/libopencm3/stm32/l4/memorymap.h
@@ -106,6 +106,7 @@
 #define GPIO_PORT_H_BASE		(PERIPH_BASE_AHB2 + 0x1c00)
 /* Still AHB2, good job ST */
 #define OTG_FS_BASE			(0x50000000U + 0x00000)
+#define USB_OTG_FS_BASE     OTG_FS_BASE
 #define ADC1_BASE			(0x50000000U + 0x40000)
 #define AES_BASE			(0x50000000U + 0x60000)
 #define RNG_BASE			(0x50000000U + 0x60800)
diff --git a/include/libopencm3/usb/dwc/otg_fs.h b/include/libopencm3/usb/dwc/otg_fs.h
index 6736c0ee..4510a849 100644
--- a/include/libopencm3/usb/dwc/otg_fs.h
+++ b/include/libopencm3/usb/dwc/otg_fs.h
@@ -28,7 +28,7 @@
 #include <libopencm3/usb/dwc/otg_common.h>
 
 /* Memory map is required for USB_OTG_FS_BASE address */
-#if defined(STM32F1) || defined(STM32F2) || defined(STM32F4)
+#if defined(STM32F1) || defined(STM32F2) || defined(STM32F4) || defined(STM32L4)
 #	include <libopencm3/stm32/memorymap.h>
 #elif defined(EFM32HG)
 #	include <libopencm3/efm32/memorymap.h>
diff --git a/lib/stm32/l4/Makefile b/lib/stm32/l4/Makefile
index 9dc9e8d8..2f26dfd0 100644
--- a/lib/stm32/l4/Makefile
+++ b/lib/stm32/l4/Makefile
@@ -58,6 +58,7 @@ OBJS += usart_common_all.o usart_common_v2.o
 OBJS += usb.o usb_control.o usb_standard.o usb_msc.o
 OBJS += usb_hid.o
 OBJS += st_usbfs_core.o st_usbfs_v2.o
+OBJS += usb_dwc_common.o usb_f107.o
 
 VPATH += ../../usb:../:../../cm3:../common
 VPATH += ../../ethernet