diff --git a/os/common/ports/ARMCMx/chcore_v6m.h b/os/common/ports/ARMCMx/chcore_v6m.h
index eb1193600..d62fc719a 100644
--- a/os/common/ports/ARMCMx/chcore_v6m.h
+++ b/os/common/ports/ARMCMx/chcore_v6m.h
@@ -126,6 +126,14 @@
 #error "ChibiOS Cortex-M0 port not licensed"
 #endif
 
+/* Handling a GCC problem impacting ARMv6-M.*/
+#if defined(__GNUC__) && !defined(PORT_IGNORE_GCC_VERSION_CHECK)
+#if __GNUC__ > 5
+#warning "This compiler has a know problem with Cortex-M0, see bugs: 88167, 88656."
+#warning "*** Use GCC version 5 or below ***"
+#endif
+#endif
+
 /**
  * @name    Architecture and Compiler
  * @{
diff --git a/readme.txt b/readme.txt
index 9ccfe2570..49c8da9ab 100644
--- a/readme.txt
+++ b/readme.txt
@@ -75,6 +75,8 @@
 *****************************************************************************
 
 *** Next ***
+- NEW: Added a sanity check on GCC version for ARMv6-M, a version below 6
+       must be used.
 - NEW: Removed deprecated EXT driver.
 - NEW: Added a new function chMtxGetOwnerI() to RT mutexes subsystem.
 - NEW: STM32L433 added to STM32L4xx HAL.