diff --git a/cpu/samd21/Makefile b/cpu/samd21/Makefile
index 21f0d18719..6f9d9482ca 100644
--- a/cpu/samd21/Makefile
+++ b/cpu/samd21/Makefile
@@ -2,6 +2,6 @@
 MODULE = cpu
 
 # add a list of subdirectories, that should also be build
-DIRS = periph $(RIOTCPU)/cortexm_common
+DIRS = periph $(RIOTCPU)/cortexm_common $(RIOTCPU)/sam21_common
 
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/samd21/Makefile.include b/cpu/samd21/Makefile.include
index 52622dfc07..491c55c892 100644
--- a/cpu/samd21/Makefile.include
+++ b/cpu/samd21/Makefile.include
@@ -1,9 +1,5 @@
 export CPU_ARCH = cortex-m0plus
+export CPU_FAM  = samd21
 
-# this CPU implementation doesn't use CMSIS initialisation
-export CFLAGS += -DDONT_USE_CMSIS_INIT
-
-# use common periph functions
-USEMODULE += periph_common
-
+include $(RIOTCPU)/sam21_common/Makefile.include
 include $(RIOTCPU)/Makefile.include.cortexm_common