diff --git a/boards/arduino-atmega-common/include/board_common.h b/boards/arduino-atmega-common/include/board_common.h
index 03d63b136f81..b4ec596bbf1e 100644
--- a/boards/arduino-atmega-common/include/board_common.h
+++ b/boards/arduino-atmega-common/include/board_common.h
@@ -65,12 +65,12 @@ extern "C" {
  */
 #ifdef CPU_ATMEGA328P
 #define AVR_CONTEXT_SWAP_INIT do { \
-            DDRC |= (1 << PC5); \
-            PCICR |= (1 << PCIE1); \
-            PCMSK1 |= (1 << PCINT13); \
+            DDRD |= (1 << PD7); \
+            PCICR |= (1 << PCIE2); \
+            PCMSK2 |= (1 << PCINT23); \
 } while (0)
-#define AVR_CONTEXT_SWAP_INTERRUPT_VECT  PCINT1_vect
-#define AVR_CONTEXT_SWAP_TRIGGER   PORTC ^= (1 << PC5)
+#define AVR_CONTEXT_SWAP_INTERRUPT_VECT  PCINT2_vect
+#define AVR_CONTEXT_SWAP_TRIGGER   PORTD ^= (1 << PD7)
 #endif
 
 #ifdef CPU_ATMEGA2560