diff --git a/examples/zolertia/zoul/test-weather-meter.c b/examples/zolertia/zoul/test-weather-meter.c
index 93998d9e8..17417fea1 100644
--- a/examples/zolertia/zoul/test-weather-meter.c
+++ b/examples/zolertia/zoul/test-weather-meter.c
@@ -97,6 +97,9 @@ PROCESS_THREAD(test_weather_meter_sensors, ev, data)
   static uint16_t wind_speed_avg_2m;
   static uint16_t wind_speed_max;
 
+  printf("Weather meter test example, integration period %u\n",
+         WEATHER_METER_AVG_PERIOD);
+
   /* Register the callback handler when thresholds are met */
   WEATHER_METER_REGISTER_ANEMOMETER_INT(wind_speed_callback);
   WEATHER_METER_REGISTER_RAIN_GAUGE_INT(rain_callback);
@@ -120,9 +123,9 @@ PROCESS_THREAD(test_weather_meter_sensors, ev, data)
     rain = weather_meter.value(WEATHER_METER_RAIN_GAUGE);
     wind_speed = weather_meter.value(WEATHER_METER_ANEMOMETER);
     wind_dir = weather_meter.value(WEATHER_METER_WIND_VANE);
-    wind_dir_avg_2m = weather_meter.value(WEATHER_METER_WIND_VANE_AVG_2M);
+    wind_dir_avg_2m = weather_meter.value(WEATHER_METER_WIND_VANE_AVG_X);
     wind_speed_avg = weather_meter.value(WEATHER_METER_ANEMOMETER_AVG);
-    wind_speed_avg_2m = weather_meter.value(WEATHER_METER_ANEMOMETER_AVG_2M);
+    wind_speed_avg_2m = weather_meter.value(WEATHER_METER_ANEMOMETER_AVG_X);
     wind_speed_max = weather_meter.value(WEATHER_METER_ANEMOMETER_MAX);
 
     #if WEATHER_METER_RAIN_RETURN_TICKS
diff --git a/platform/zoul/dev/weather-meter.c b/platform/zoul/dev/weather-meter.c
index 98324b0d0..f7b972180 100644
--- a/platform/zoul/dev/weather-meter.c
+++ b/platform/zoul/dev/weather-meter.c
@@ -91,8 +91,8 @@ typedef struct {
   uint16_t value_max;
   uint64_t ticks_avg;
   uint64_t value_avg;
-  uint32_t value_buf_2m;
-  uint16_t value_avg_2m;
+  uint32_t value_buf_xm;
+  uint16_t value_avg_xm;
 } weather_meter_ext_t;
 
 typedef struct {
@@ -102,9 +102,9 @@ typedef struct {
 } weather_meter_sensors;
 
 typedef struct {
-  uint32_t value_buf_2m;
+  uint32_t value_buf_xm;
   uint16_t value_prev;
-  uint16_t value_avg_2m;
+  uint16_t value_avg_xm;
 } weather_meter_wind_vane_ext_t;
 
 static weather_meter_sensors weather_sensors;
@@ -200,7 +200,7 @@ rt_callback(struct rtimer *t, void *ptr)
   weather_sensors.anemometer.value = (uint16_t)wind_speed;
   anemometer.ticks_avg++;
   anemometer.value_avg += weather_sensors.anemometer.value;
-  anemometer.value_buf_2m += weather_sensors.anemometer.value;
+  anemometer.value_buf_xm += weather_sensors.anemometer.value;
 
   /* Take maximum value */
   if(weather_sensors.anemometer.value > anemometer.value_max) {
@@ -219,30 +219,30 @@ rt_callback(struct rtimer *t, void *ptr)
     wind_vane.value_prev += wind_dir_delta;
   }
 
-  wind_vane.value_buf_2m += wind_vane.value_prev;
+  wind_vane.value_buf_xm += wind_vane.value_prev;
 
   /* Calculate the 2 minute average */
-  if(!(anemometer.ticks_avg % 120)) {
-    PRINTF("Weather: calculate the 2m averages ***\n");
+  if(!(anemometer.ticks_avg % WEATHER_METER_AVG_PERIOD)) {
+    PRINTF("Weather: calculate the %u averages ***\n", WEATHER_METER_AVG_PERIOD);
 
-    if(anemometer.value_buf_2m) {
-      anemometer.value_avg_2m = anemometer.value_buf_2m / 120;
-      anemometer.value_buf_2m = 0;
+    if(anemometer.value_buf_xm) {
+      anemometer.value_avg_xm = anemometer.value_buf_xm / WEATHER_METER_AVG_PERIOD;
+      anemometer.value_buf_xm = 0;
     } else {
-      anemometer.value_avg_2m = 0;
+      anemometer.value_avg_xm = 0;
     }
 
-	wind_vane.value_buf_2m = wind_vane.value_buf_2m / 120;
-    wind_vane.value_avg_2m = (uint16_t)wind_vane.value_buf_2m;
-	if(wind_vane.value_avg_2m >= 3600) {
-      wind_vane.value_avg_2m -= 3600;
+	wind_vane.value_buf_xm = wind_vane.value_buf_xm / WEATHER_METER_AVG_PERIOD;
+    wind_vane.value_avg_xm = (uint16_t)wind_vane.value_buf_xm;
+	if(wind_vane.value_avg_xm >= 3600) {
+      wind_vane.value_avg_xm -= 3600;
     }
 
-	if(wind_vane.value_avg_2m < 0) {
-      wind_vane.value_avg_2m += 3600;
+	if(wind_vane.value_avg_xm < 0) {
+      wind_vane.value_avg_xm += 3600;
     }
 
-    wind_vane.value_buf_2m = 0;
+    wind_vane.value_buf_xm = 0;
     wind_vane.value_prev = wind_dir;
   }
 
@@ -323,9 +323,9 @@ value(int type)
   if((type != WEATHER_METER_ANEMOMETER) &&
     (type != WEATHER_METER_RAIN_GAUGE) &&
     (type != WEATHER_METER_WIND_VANE) &&
-    (type != WEATHER_METER_WIND_VANE_AVG_2M) &&
+    (type != WEATHER_METER_WIND_VANE_AVG_X) &&
     (type != WEATHER_METER_ANEMOMETER_AVG) &&
-    (type != WEATHER_METER_ANEMOMETER_AVG_2M) &&
+    (type != WEATHER_METER_ANEMOMETER_AVG_X) &&
     (type != WEATHER_METER_ANEMOMETER_MAX)) {
     PRINTF("Weather: requested an invalid sensor value\n");
     return WEATHER_METER_ERROR;
@@ -340,8 +340,8 @@ value(int type)
   case WEATHER_METER_WIND_VANE:
     return weather_meter_get_wind_dir();
 
-  case WEATHER_METER_WIND_VANE_AVG_2M:
-    return wind_vane.value_avg_2m;
+  case WEATHER_METER_WIND_VANE_AVG_X:
+    return wind_vane.value_avg_xm;
 
   case WEATHER_METER_ANEMOMETER:
     return weather_sensors.anemometer.value;
@@ -353,8 +353,8 @@ value(int type)
     aux = anemometer.value_avg / anemometer.ticks_avg;
     return (uint16_t)aux;
 
-  case WEATHER_METER_ANEMOMETER_AVG_2M:
-    return anemometer.value_avg_2m;
+  case WEATHER_METER_ANEMOMETER_AVG_X:
+    return anemometer.value_avg_xm;
 
   case WEATHER_METER_ANEMOMETER_MAX:
     return anemometer.value_max;
diff --git a/platform/zoul/dev/weather-meter.h b/platform/zoul/dev/weather-meter.h
index 1ce941968..9f6d1fc7f 100644
--- a/platform/zoul/dev/weather-meter.h
+++ b/platform/zoul/dev/weather-meter.h
@@ -55,12 +55,19 @@
  */
 #define WEATHER_METER_RAIN_GAUGE          0x01
 #define WEATHER_METER_WIND_VANE           0x02
-#define WEATHER_METER_WIND_VANE_AVG_2M    0x03
+#define WEATHER_METER_WIND_VANE_AVG_X     0x03
 #define WEATHER_METER_ANEMOMETER          0x04
 #define WEATHER_METER_ANEMOMETER_AVG      0x05
-#define WEATHER_METER_ANEMOMETER_AVG_2M   0x06
+#define WEATHER_METER_ANEMOMETER_AVG_X    0x06
 #define WEATHER_METER_ANEMOMETER_MAX      0x07
 
+/* Period (seconds) to calculate an average */
+#ifdef WEATHER_METER_CONF_AVG_PERIOD
+#define WEATHER_METER_AVG_PERIOD          WEATHER_METER_CONF_AVG_PERIOD
+#else
+#define WEATHER_METER_AVG_PERIOD          120
+#endif
+
 #define WEATHER_METER_ACTIVE              SENSORS_ACTIVE
 #define WEATHER_METER_ANEMOMETER_INT_OVER HW_INT_OVER_THRS
 #define WEATHER_METER_ANEMOMETER_INT_DIS  HW_INT_DISABLE