diff --git a/boards/Makefile.include.cortexm_common b/boards/Makefile.include.cortexm_common
index 9273b7e198d2bd47bcb1c18e3f1a45d20cc108aa..cd6bf0d560ddada27b8a2295ceee67229426f494 100644
--- a/boards/Makefile.include.cortexm_common
+++ b/boards/Makefile.include.cortexm_common
@@ -16,7 +16,7 @@ export CFLAGS_OPT   ?= -Os
 export CFLAGS += $(CFLAGS_CPU) $(CFLAGS_STYLE) $(CFLAGS_LINK) $(CFLAGS_DBG) $(CFLAGS_OPT)
 
 export ASFLAGS += $(CFLAGS_CPU) $(CFLAGS_DEBUG)
-export LINKFLAGS += -L$(RIOTCPU)/$(CPU) -T$(RIOTCPU)/$(CPU)/$(CPU_MODEL)_linkerscript.ld
+export LINKFLAGS += -L$(RIOTCPU)/$(CPU)/ldscripts -T$(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL).ld -Wl,--fatal-warnings
 export LINKFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_CPU) $(CFLAGS_STYLE) -static -lgcc -nostartfiles
 
 # use the nano-specs of the NewLib when available
diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include
index 1e013a276f1e197321ae087697a61caeb262d2a2..0c6f87806311c8d740138d9eba5a81942b7f1d14 100644
--- a/boards/msba2-common/Makefile.include
+++ b/boards/msba2-common/Makefile.include
@@ -15,7 +15,7 @@ export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
 FLASHER = lpc2k_pgm
 TERMPROG ?= $(RIOTBASE)/dist/tools/pyterm/pyterm
-LINKFLAGS += -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x -Wl,--gc-sections
+LINKFLAGS += -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/ldscripts/$(CPU).ld -Wl,--gc-sections
 
 # unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++
 export CXXUWFLAGS +=
diff --git a/cpu/atmega2560/Makefile.include b/cpu/atmega2560/Makefile.include
index 56dd682965737f32405fdf179ffe7c6f54870fb1..0adb5831716fde1e37b4228fc8abf4e2c01562eb 100644
--- a/cpu/atmega2560/Makefile.include
+++ b/cpu/atmega2560/Makefile.include
@@ -9,7 +9,7 @@ export USEMODULE += atmega_common
 export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
 
 # define the linker script to use for this CPU
-#export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/atmega2560_linkerscript.ld
+#export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/ldscripts/atmega2560.ld
 
 # include CPU specific includes
 export INCLUDES += -I$(RIOTCPU)/$(CPU)/include
diff --git a/cpu/cc2538/cc2538_linkerscript.ld b/cpu/cc2538/ldscripts/cc2538.ld
similarity index 100%
rename from cpu/cc2538/cc2538_linkerscript.ld
rename to cpu/cc2538/ldscripts/cc2538.ld
diff --git a/cpu/cc2538/cc2538nf11_linkerscript.ld b/cpu/cc2538/ldscripts/cc2538nf11.ld
similarity index 95%
rename from cpu/cc2538/cc2538nf11_linkerscript.ld
rename to cpu/cc2538/ldscripts/cc2538nf11.ld
index 6892cb49bdc6961979955a2f4f702c55b770dc15..9212752b315beda24345fc4fe22c6e393a06b7dd 100644
--- a/cpu/cc2538/cc2538nf11_linkerscript.ld
+++ b/cpu/cc2538/ldscripts/cc2538nf11.ld
@@ -25,6 +25,6 @@ MEMORY
     ram   (rwx) : ORIGIN = 0x20004000, LENGTH = 16K
 }
 
-INCLUDE cc2538_linkerscript.ld
+INCLUDE cc2538.ld
 
 /* @} */
diff --git a/cpu/cc2538/cc2538nf23_linkerscript.ld b/cpu/cc2538/ldscripts/cc2538nf23.ld
similarity index 96%
rename from cpu/cc2538/cc2538nf23_linkerscript.ld
rename to cpu/cc2538/ldscripts/cc2538nf23.ld
index d0670b6ca32e95c514b440dbb55d6b3c4f1b7d3e..5e6d7ac978f99a4d0800b3594bbc127e391bf935 100644
--- a/cpu/cc2538/cc2538nf23_linkerscript.ld
+++ b/cpu/cc2538/ldscripts/cc2538nf23.ld
@@ -26,6 +26,6 @@ MEMORY
     ram   (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
-INCLUDE cc2538_linkerscript.ld
+INCLUDE cc2538.ld
 
 /* @} */
diff --git a/cpu/cc2538/cc2538nf53_linkerscript.ld b/cpu/cc2538/ldscripts/cc2538nf53.ld
similarity index 96%
rename from cpu/cc2538/cc2538nf53_linkerscript.ld
rename to cpu/cc2538/ldscripts/cc2538nf53.ld
index f9eb6652210856cb18810dab1bdad1ed58917dd4..e69e01af137796bc13f0224f4e8156c379aea79c 100644
--- a/cpu/cc2538/cc2538nf53_linkerscript.ld
+++ b/cpu/cc2538/ldscripts/cc2538nf53.ld
@@ -26,6 +26,6 @@ MEMORY
     ram   (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
-INCLUDE cc2538_linkerscript.ld
+INCLUDE cc2538.ld
 
 /* @} */
diff --git a/cpu/cc2538/cc2538sf53_linkerscript.ld b/cpu/cc2538/ldscripts/cc2538sf53.ld
similarity index 95%
rename from cpu/cc2538/cc2538sf53_linkerscript.ld
rename to cpu/cc2538/ldscripts/cc2538sf53.ld
index 829012f2d4071389a64562af6c5e3b5f7227acbc..525846530c5b0905f4958d0c3b296de6028e854d 100644
--- a/cpu/cc2538/cc2538sf53_linkerscript.ld
+++ b/cpu/cc2538/ldscripts/cc2538sf53.ld
@@ -24,6 +24,6 @@ MEMORY
     ram   (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
-INCLUDE cc2538_linkerscript.ld
+INCLUDE cc2538.ld
 
 /* @} */
diff --git a/cpu/kw2x/Makefile.include b/cpu/kw2x/Makefile.include
index 451675344d9ad1052befe32b7a2281582368ddc7..c5fb24c077143298f212875917d1e9c76b927ab0 100644
--- a/cpu/kw2x/Makefile.include
+++ b/cpu/kw2x/Makefile.include
@@ -23,7 +23,7 @@ include $(KINETIS_COMMON)Makefile.include
 
 export LINKFLAGS += -L$(RIOTCPU)/kinetis_common/ldscripts
 # define the linker script to use for this CPU
-export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/$(CPU_MODEL)_linkerscript.ld
+export LINKERSCRIPT = $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL).ld
 
 #export the CPU model
 MODEL = $(shell echo $(CPU_MODEL)|tr 'a-z' 'A-Z')
diff --git a/cpu/kw2x/kw21d256_linkerscript.ld b/cpu/kw2x/ldscripts/kw21d256.ld
similarity index 100%
rename from cpu/kw2x/kw21d256_linkerscript.ld
rename to cpu/kw2x/ldscripts/kw21d256.ld
diff --git a/cpu/kw2x/kw21d512_linkerscript.ld b/cpu/kw2x/ldscripts/kw21d512.ld
similarity index 100%
rename from cpu/kw2x/kw21d512_linkerscript.ld
rename to cpu/kw2x/ldscripts/kw21d512.ld
diff --git a/cpu/kw2x/kw22d512_linkerscript.ld b/cpu/kw2x/ldscripts/kw22d512.ld
similarity index 100%
rename from cpu/kw2x/kw22d512_linkerscript.ld
rename to cpu/kw2x/ldscripts/kw22d512.ld
diff --git a/cpu/lpc1768/lpc1768_linkerscript.ld b/cpu/lpc1768/ldscripts/lpc1768.ld
similarity index 100%
rename from cpu/lpc1768/lpc1768_linkerscript.ld
rename to cpu/lpc1768/ldscripts/lpc1768.ld
diff --git a/cpu/lpc2387/linkerscript.x b/cpu/lpc2387/ldscripts/lpc2387.ld
similarity index 100%
rename from cpu/lpc2387/linkerscript.x
rename to cpu/lpc2387/ldscripts/lpc2387.ld
diff --git a/cpu/nrf51822/nrf51822qfaa_linkerscript.ld b/cpu/nrf51822/ldscripts/nrf51822qfaa.ld
similarity index 100%
rename from cpu/nrf51822/nrf51822qfaa_linkerscript.ld
rename to cpu/nrf51822/ldscripts/nrf51822qfaa.ld
diff --git a/cpu/sam3x8e/sam3x8e_linkerscript.ld b/cpu/sam3x8e/ldscripts/sam3x8e.ld
similarity index 100%
rename from cpu/sam3x8e/sam3x8e_linkerscript.ld
rename to cpu/sam3x8e/ldscripts/sam3x8e.ld
diff --git a/cpu/samd21/samr21g18a_linkerscript.ld b/cpu/samd21/ldscripts/samr21g18a.ld
similarity index 100%
rename from cpu/samd21/samr21g18a_linkerscript.ld
rename to cpu/samd21/ldscripts/samr21g18a.ld
diff --git a/cpu/saml21/saml21j18a_linkerscript.ld b/cpu/saml21/ldscripts/saml21j18a.ld
similarity index 100%
rename from cpu/saml21/saml21j18a_linkerscript.ld
rename to cpu/saml21/ldscripts/saml21j18a.ld
diff --git a/cpu/stm32f0/stm32f051r8_linkerscript.ld b/cpu/stm32f0/ldscripts/stm32f051r8.ld
similarity index 100%
rename from cpu/stm32f0/stm32f051r8_linkerscript.ld
rename to cpu/stm32f0/ldscripts/stm32f051r8.ld
diff --git a/cpu/stm32f0/stm32f091rc_linkerscript.ld b/cpu/stm32f0/ldscripts/stm32f091rc.ld
similarity index 100%
rename from cpu/stm32f0/stm32f091rc_linkerscript.ld
rename to cpu/stm32f0/ldscripts/stm32f091rc.ld
diff --git a/cpu/stm32f1/stm32f103cb_linkerscript.ld b/cpu/stm32f1/ldscripts/stm32f103cb.ld
similarity index 100%
rename from cpu/stm32f1/stm32f103cb_linkerscript.ld
rename to cpu/stm32f1/ldscripts/stm32f103cb.ld
diff --git a/cpu/stm32f1/stm32f103re_linkerscript.ld b/cpu/stm32f1/ldscripts/stm32f103re.ld
similarity index 100%
rename from cpu/stm32f1/stm32f103re_linkerscript.ld
rename to cpu/stm32f1/ldscripts/stm32f103re.ld
diff --git a/cpu/stm32f3/stm32f303vc_linkerscript.ld b/cpu/stm32f3/ldscripts/stm32f303vc.ld
similarity index 100%
rename from cpu/stm32f3/stm32f303vc_linkerscript.ld
rename to cpu/stm32f3/ldscripts/stm32f303vc.ld
diff --git a/cpu/stm32f3/stm32f334r8_linkerscript.ld b/cpu/stm32f3/ldscripts/stm32f334r8.ld
similarity index 100%
rename from cpu/stm32f3/stm32f334r8_linkerscript.ld
rename to cpu/stm32f3/ldscripts/stm32f334r8.ld
diff --git a/cpu/stm32f4/stm32f407vg_linkerscript.ld b/cpu/stm32f4/ldscripts/stm32f407vg.ld
similarity index 100%
rename from cpu/stm32f4/stm32f407vg_linkerscript.ld
rename to cpu/stm32f4/ldscripts/stm32f407vg.ld
diff --git a/cpu/stm32f4/stm32f415rg_linkerscript.ld b/cpu/stm32f4/ldscripts/stm32f415rg.ld
similarity index 100%
rename from cpu/stm32f4/stm32f415rg_linkerscript.ld
rename to cpu/stm32f4/ldscripts/stm32f415rg.ld
diff --git a/cpu/stm32l1/stm32l152ret6_linkerscript.ld b/cpu/stm32l1/ldscripts/stm32l152ret6.ld
similarity index 100%
rename from cpu/stm32l1/stm32l152ret6_linkerscript.ld
rename to cpu/stm32l1/ldscripts/stm32l152ret6.ld