diff --git a/include/libopencm3/stm32/f0/crs.h b/include/libopencm3/stm32/common/crs_common_all.h
similarity index 97%
rename from include/libopencm3/stm32/f0/crs.h
rename to include/libopencm3/stm32/common/crs_common_all.h
index dc7eeee0..2ce29f36 100644
--- a/include/libopencm3/stm32/f0/crs.h
+++ b/include/libopencm3/stm32/common/crs_common_all.h
@@ -1,8 +1,8 @@
 /** @defgroup CRS_defines CRS Defines
  *
- * @brief <b>Defined Constants and Types for the STM32F0xx Clock Recovery</b>
+ * @brief <b>STM32 Clock Recovery System: Defined Constants and Types</b>
  *
- * @ingroup STM32F0xx_defines
+ * @ingroup STM32_defines
  *
  * @version 1.0.0
  *
diff --git a/include/libopencm3/stm32/crs.h b/include/libopencm3/stm32/crs.h
index d75a624a..95c3985d 100644
--- a/include/libopencm3/stm32/crs.h
+++ b/include/libopencm3/stm32/crs.h
@@ -1,4 +1,4 @@
-/* This provides unification of code over STM32F subfamilies */
+/* This provides unification of code over STM32 subfamilies */
 
 /*
  * This file is part of the libopencm3 project.
@@ -21,8 +21,8 @@
 #include <libopencm3/stm32/memorymap.h>
 
 #if defined(STM32F0)
-#       include <libopencm3/stm32/f0/crs.h>
+#       include <libopencm3/stm32/common/crs_common_all.h>
 #else
-#       error "stm32 family not defined."
+#       error "stm32 family not defined or not supported for this peripheral"
 #endif
 
diff --git a/lib/stm32/f0/crs.c b/lib/stm32/common/crs_common_all.c
similarity index 88%
rename from lib/stm32/f0/crs.c
rename to lib/stm32/common/crs_common_all.c
index 63f3e341..5cb73bfd 100644
--- a/lib/stm32/f0/crs.c
+++ b/lib/stm32/common/crs_common_all.c
@@ -1,8 +1,8 @@
 /** @defgroup crs_file CRS
  *
- * @ingroup STM32F0xx
+ * @ingroup STM32xx
  *
- * @brief <b>libopencm3 STM32F0xx Clock Recovery Subsystem</b>
+ * @brief <b>libopencm3 STM32 Clock Recovery Subsystem</b>
  *
  * @version 1.0.0
  *
@@ -32,7 +32,7 @@
 #include <libopencm3/stm32/rcc.h>
 
 /**
- * This function enables autonatic trimming of internal RC oscillator by USB SOF
+ * This function enables automatic trimming of internal RC oscillator by USB SOF
  * frames
  */
 void crs_autotrim_usb_enable(void)
diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile
index 152f2d7a..3c3b45a5 100644
--- a/lib/stm32/f0/Makefile
+++ b/lib/stm32/f0/Makefile
@@ -42,7 +42,8 @@ OBJS            += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \
                    pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \
                    dma_common_l1f013.o exti_common_all.o spi_common_all.o \
 		   spi_common_f03.o flash_common_f01.o dac_common_all.o \
-		   timer_common_all.o rcc_common_all.o crs.o
+		   timer_common_all.o rcc_common_all.o
+OBJS		+= crs_common_all.o
 
 OBJS		+= usb.o usb_control.o usb_standard.o
 OBJS		+= st_usbfs_core.o st_usbfs_v2.o