diff --git a/boards/samr21-xpro/Makefile.include b/boards/samr21-xpro/Makefile.include
index 851983a6665587e514a4748ef466fc0dfc834a55..134299f616025fc10d59938639ed286b191f2542 100644
--- a/boards/samr21-xpro/Makefile.include
+++ b/boards/samr21-xpro/Makefile.include
@@ -1,6 +1,6 @@
 # define the cpu used by SAMR21 Xplained Pro board
 export CPU = samd21
-export CPU_MODEL = samr21g18a
+export CPU_MODEL = samr21x18a
 
 # set default port depending on operating system
 PORT_LINUX ?= /dev/ttyACM0
diff --git a/cpu/samd21/ldscripts/samr21g18a.ld b/cpu/samd21/ldscripts/samr21x18a.ld
similarity index 78%
rename from cpu/samd21/ldscripts/samr21g18a.ld
rename to cpu/samd21/ldscripts/samr21x18a.ld
index 71715a2fb4bf6a20f256ea2515afbed1f3d0d0ce..b47c76d96ffc1d166c5f57c0ef2685a6e4e35337 100644
--- a/cpu/samd21/ldscripts/samr21g18a.ld
+++ b/cpu/samd21/ldscripts/samr21x18a.ld
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Freie Universität Berlin
+ * Copyright (C) 2015, 2016 Freie Universität Berlin
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -11,7 +11,7 @@
  * @{
  *
  * @file
- * @brief           Memory definitions for the SAMR21G18A
+ * @brief           Memory definitions for the SAMR21E18A and SAMR21G18A
  *
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  *