diff --git a/boards/arduino-uno/Makefile b/boards/arduino-uno/Makefile
index 070aba9f1..b597cd662 100644
--- a/boards/arduino-uno/Makefile
+++ b/boards/arduino-uno/Makefile
@@ -1,5 +1,5 @@
 MODULE = board
 
-DIRS = $(RIOTBOARD)/arduino-common
+DIRS = $(RIOTBOARD)/arduino-atmega-common
 
 include $(RIOTBASE)/Makefile.base
diff --git a/boards/arduino-uno/Makefile.features b/boards/arduino-uno/Makefile.features
index da28e25db..f76efd160 100644
--- a/boards/arduino-uno/Makefile.features
+++ b/boards/arduino-uno/Makefile.features
@@ -1 +1 @@
-include $(RIOTBOARD)/arduino-common/Makefile.features
+include $(RIOTBOARD)/arduino-atmega-common/Makefile.features
diff --git a/boards/arduino-uno/Makefile.include b/boards/arduino-uno/Makefile.include
index f2d017c51..d17c0665e 100644
--- a/boards/arduino-uno/Makefile.include
+++ b/boards/arduino-uno/Makefile.include
@@ -1,10 +1,19 @@
-USEMODULE += arduino-common
+# define the cpu used by the arduino uno board
+export CPU = atmega328p
 
-# add arduino-common include path
-INCLUDES += -I$(RIOTBOARD)/arduino-common/include
+USEMODULE += arduino-atmega-common
+
+# add arduino-atmega-common include path
+INCLUDES += -I$(RIOTBOARD)/arduino-atmega-common/include
 
 # export needed for flash rule
-export LINUX_PORT = /dev/ttyACM0
-export PROGRAMMER_SPEED = 115200
+export LINUX_PORT ?= /dev/ttyACM0
+export PROGRAMMER_SPEED ?= 115200
+
+export FFLAGS += -p m328p
+
+# PROGRAMMER defaults to arduino which is the internal flasher via USB. Can be
+# overridden for debugging (which requires changes that require to use an ISP)
+export PROGRAMMER ?= arduino
 
-include $(RIOTBOARD)/arduino-common/Makefile.include
+include $(RIOTBOARD)/arduino-atmega-common/Makefile.include