diff --git a/include/libopencm3/stm32/f3/memorymap.h b/include/libopencm3/stm32/f3/memorymap.h
index 6aa29c6c..1b579f47 100644
--- a/include/libopencm3/stm32/f3/memorymap.h
+++ b/include/libopencm3/stm32/f3/memorymap.h
@@ -57,7 +57,7 @@
 #define UART5_BASE			(PERIPH_BASE_APB1 + 0x5000)
 #define I2C1_BASE			(PERIPH_BASE_APB1 + 0x5400)
 #define I2C2_BASE			(PERIPH_BASE_APB1 + 0x5800)
-#define USB_FS_BASE			(PERIPH_BASE_APB1 + 0x5C00)
+#define USB_DEV_FS_BASE			(PERIPH_BASE_APB1 + 0x5C00)
 #define USB_SRAM_BASE			(PERIPH_BASE_APB1 + 0x6000)
 #define BX_CAN_BASE			(PERIPH_BASE_APB1 + 0x6400)
 /* PERIPH_BASE_APB1 + 0x6800 (0x4000 6800 - 0x4000 6BFF): Reserved */
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index 8efe67cc..aa3304dc 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -41,6 +41,7 @@ OBJS            += gpio_common_all.o gpio_common_f234.o \
 		   iwdg_common_all.o spi_common_all.o dma_common_f13.o\
 		   timer_common_all.o timer_common_f24.o flash_common_f234.o
 
+OBJS		+= usb.o usb_control.o usb_standard.o usb_f103.o
 
 VPATH += ../../usb:../:../../cm3:../common