diff --git a/boards/nucleo-f091/include/board.h b/boards/nucleo-f091/include/board.h
index 6725b0bde952a45dbea7249166001126244309d5..e0e275e8707ade6512ddcf3b4645724175e3fbc9 100644
--- a/boards/nucleo-f091/include/board.h
+++ b/boards/nucleo-f091/include/board.h
@@ -56,6 +56,11 @@ extern "C" {
 #define LED_ORANGE_TOGGLE
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/nucleo-f103/include/board.h b/boards/nucleo-f103/include/board.h
index 3c441852cb5b9664b190e6b7c90c65ba16371a15..bdc27d53db4e0ffd4eb9d3953c028d53aeefdf22 100755
--- a/boards/nucleo-f103/include/board.h
+++ b/boards/nucleo-f103/include/board.h
@@ -67,11 +67,9 @@ extern "C" {
 /** @} */
 
 /**
- * @name Buttons
- * @{
+ * @brief   User button
  */
-#define BUTTON_USER_GPIO    GPIO_PIN(PORT_C, 13)
-/** @} */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
 
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
diff --git a/boards/nucleo-f303/include/board.h b/boards/nucleo-f303/include/board.h
index 5c47e914c4547da589f2d1f048efc2f8d4359fd2..66c1a96bb7ba570459eb6722a683771db269a5c1 100755
--- a/boards/nucleo-f303/include/board.h
+++ b/boards/nucleo-f303/include/board.h
@@ -57,6 +57,11 @@ extern "C" {
 #define LED_ORANGE_TOGGLE
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/nucleo-f334/include/board.h b/boards/nucleo-f334/include/board.h
index be2fe0460b383f84f610d5c89fd5c684a943e546..6216c2b98943476360c516ed0cd142957169d705 100644
--- a/boards/nucleo-f334/include/board.h
+++ b/boards/nucleo-f334/include/board.h
@@ -55,6 +55,11 @@ extern "C" {
 #define LED_ORANGE_TOGGLE
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+
 /**
  * @name xtimer tuning values
  * @{
diff --git a/boards/nucleo-f401/include/board.h b/boards/nucleo-f401/include/board.h
index 5d87b5c9d31d450a699190989f1970cc21020096..4078011f9aad69db219f9fa0edcd3aead0722fe7 100644
--- a/boards/nucleo-f401/include/board.h
+++ b/boards/nucleo-f401/include/board.h
@@ -64,6 +64,10 @@ extern "C" {
 #define LED_ORANGE_TOGGLE
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
 
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
diff --git a/boards/nucleo-l1/include/board.h b/boards/nucleo-l1/include/board.h
index 0d016c2f02f25814156f5bd51c505fc94aec8628..9598c5e33e6da01d7486c1e303a7f04e9ab85a01 100644
--- a/boards/nucleo-l1/include/board.h
+++ b/boards/nucleo-l1/include/board.h
@@ -65,6 +65,11 @@ extern "C" {
 #define LED_ORANGE_TOGGLE
 /** @} */
 
+/**
+ * @brief   User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_C, 13)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/saml21-xpro/include/board.h b/boards/saml21-xpro/include/board.h
index 608f8d7545187bff29a98543ce6bd1fe85db545c..2acc559ff6b6d623384a5e92ab685d607a50b384 100644
--- a/boards/saml21-xpro/include/board.h
+++ b/boards/saml21-xpro/include/board.h
@@ -55,6 +55,11 @@ extern "C" {
 #define LED_RED_TOGGLE      /* not available */
 /** @} */
 
+/**
+ * @brief User button pin
+ */
+#define SW0_PIN             GPIO_PIN(PA, 2)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h
index 539db663dfe04d756ef279d6fe6fea075b33bedc..8f791c0edbea8c35f6ee557cac396b5ea97d33c8 100644
--- a/boards/stm32f0discovery/include/board.h
+++ b/boards/stm32f0discovery/include/board.h
@@ -56,6 +56,11 @@ extern "C" {
 #define LED_RED_TOGGLE      LD4_TOGGLE
 /** @} */
 
+/**
+ * @brief User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_A, 0)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h
index a6412d9b6f9c77846c463046a6ebe51c5b5c947d..73ddfba700048d93829a0bdfbac203ca01c4c17c 100644
--- a/boards/stm32f3discovery/include/board.h
+++ b/boards/stm32f3discovery/include/board.h
@@ -79,6 +79,11 @@ extern "C" {
 #define LED_RED_TOGGLE      LD5_TOGGLE
 /** @} */
 
+/**
+ * @brief User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_A, 0)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */
diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h
index 74ecd19699073f18263cc7e1a23388acdfa8a671..a195651b12820fb0e23ca8bec1cefc96937141bb 100644
--- a/boards/stm32f4discovery/include/board.h
+++ b/boards/stm32f4discovery/include/board.h
@@ -75,6 +75,11 @@ extern "C" {
 #define LED_RED_TOGGLE      LD5_TOGGLE
 /** @} */
 
+/**
+ * @brief User button
+ */
+#define BTN_B1_PIN          GPIO_PIN(PORT_A, 0)
+
 /**
  * @brief Initialize board specific hardware, including clock, LEDs and std-IO
  */