diff --git a/include/libopencm3/stm32/crs.h b/include/libopencm3/stm32/crs.h
index 69858bc2..a41cfbb1 100644
--- a/include/libopencm3/stm32/crs.h
+++ b/include/libopencm3/stm32/crs.h
@@ -26,6 +26,8 @@
 #       include <libopencm3/stm32/common/crs_common_all.h>
 #elif defined(STM32L4)
 #       include <libopencm3/stm32/common/crs_common_all.h>
+#elif defined(STM32G4)
+#       include <libopencm3/stm32/common/crs_common_all.h>
 #else
 #       error "stm32 family not defined or not supported for this peripheral"
 #endif
diff --git a/lib/stm32/g4/Makefile b/lib/stm32/g4/Makefile
index 9b59fbaf..f970ba8a 100644
--- a/lib/stm32/g4/Makefile
+++ b/lib/stm32/g4/Makefile
@@ -36,6 +36,7 @@ TGT_CFLAGS	+= $(STANDARD_FLAGS)
 ARFLAGS		= rcs
 
 OBJS += adc.o adc_common_v2.o adc_common_v2_multi.o
+OBJS += crs_common_all.o
 OBJS += dma_common_l1f013.o
 OBJS += dmamux.o
 OBJS += flash.o flash_common_all.o flash_common_f.o flash_common_idcache.o