diff --git a/boards/chronos/Makefile.features b/boards/chronos/Makefile.features
index 75806794cb..259c3f01ab 100644
--- a/boards/chronos/Makefile.features
+++ b/boards/chronos/Makefile.features
@@ -1,2 +1,3 @@
 FEATURES_PROVIDED += periph_rtc
+FEATURES_PROVIDED += periph_timer
 FEATURES_MCU_GROUP = msp430
diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
index db7446f20b..5dca015057 100644
--- a/boards/chronos/include/board.h
+++ b/boards/chronos/include/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Freie Universität Berlin
+ * Copyright (C) 2013,2015 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
@@ -32,6 +32,21 @@ extern "C" {
 #define __CC430F6137__
 #endif
 
+/**
+ * @brief   Xtimer configuration
+ * @{
+ */
+#define XTIMER                      (0)
+#define XTIMER_CHAN                 (0)
+#define XTIMER_MASK                 (0xffff0000)
+/** @} */
+
+/**
+ * @brief   Defines for compatibility with hwtimer
+ * @deprecated
+ */
+#define HW_TIMER                    (0)
+
 #define MSP430_INITIAL_CPU_SPEED    7372800uL
 #define F_CPU                       MSP430_INITIAL_CPU_SPEED
 #define F_RC_OSCILLATOR             32768
diff --git a/boards/chronos/include/periph_conf.h b/boards/chronos/include/periph_conf.h
index d76d953f6a..d5eeab40b8 100644
--- a/boards/chronos/include/periph_conf.h
+++ b/boards/chronos/include/periph_conf.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 INRIA
+ *               2015 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 directory for more
@@ -14,17 +15,28 @@
  * @brief       Chronos peripheral configuration
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef PERIPH_CONF_H_
-#define PERIPH_CONF_H_
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
- * @brief Real Time Clock configuration
+ * @brief   Timer configuration
+ * @{
+ */
+#define TIMER_DEV           (TIMER_A0)
+#define TIMER_CHAN          (5)
+#define TIMER_ISR_CC0       (TIMER0_A0_VECTOR)
+#define TIMER_ISR_CCX       (TIMER0_A1_VECTOR)
+/** @} */
+
+/**
+ * @brief   Real Time Clock configuration
  */
 #define RTC_NUMOF           (1)
 
@@ -32,4 +44,4 @@ extern "C" {
 }
 #endif
 
-#endif /* PERIPH_CONF_H_ */
+#endif /* PERIPH_CONF_H */