diff --git a/apps/shell/shell-netperf.c b/apps/shell/shell-netperf.c
index a0b458c43..eb9253a13 100644
--- a/apps/shell/shell-netperf.c
+++ b/apps/shell/shell-netperf.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-netperf.c,v 1.5 2010/02/02 15:29:24 adamdunkels Exp $
+ * $Id: shell-netperf.c,v 1.6 2010/02/18 20:56:12 adamdunkels Exp $
  */
 
 /**
@@ -287,7 +287,11 @@ construct_next_packet(void)
     msg = packetbuf_dataptr();
     msg->datapath_command = DATAPATH_COMMAND_NONE;
     msg->received = 0;
+#if TIMESYNCH_CONF_ENABLED
     msg->tx = msg->rx = timesynch_time();
+#else /* TIMESYNCH_CONF_ENABLED */
+    msg->tx = msg->rx = 0;
+#endif /* TIMESYNCH_CONF_ENABLED */
     rimeaddr_copy(&msg->receiver, &receiver);
     left_to_send--;
     return 1;
@@ -328,7 +332,12 @@ process_incoming_packet(void)
   rtimer_clock_t now;
   struct datapath_msg msg_copy;
 
+#if TIMESYNCH_CONF_ENABLED
   now = timesynch_time();
+#else /* TIMESYNCH_CONF_ENABLED */
+  now = 0;
+#endif /* TIMESYNCH_CONF_ENABLED */
+  
   memcpy_misaligned(&msg_copy, (uint8_t *)msg, sizeof(msg_copy));
   stats.received++;
   stats.total_tx_latency += msg_copy.rx - msg_copy.tx;
@@ -339,7 +348,11 @@ static int
 construct_reply(const rimeaddr_t *from)
 {
   struct datapath_msg *msg = packetbuf_dataptr();
+#if TIMESYNCH_CONF_ENABLED
   rtimer_clock_t now = timesynch_time();
+#else /* TIMESYNCH_CONF_ENABLED */
+  rtimer_clock_t now = 0;
+#endif /* TIMESYNCH_CONF_ENABLED */
 
   memcpy_misaligned(&msg->rx, &now, sizeof(rtimer_clock_t));
 
diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
index 730f0b16c..4eeda26c4 100644
--- a/apps/shell/shell-sky.c
+++ b/apps/shell/shell-sky.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-sky.c,v 1.14 2010/01/14 15:05:40 joxe Exp $
+ * $Id: shell-sky.c,v 1.15 2010/02/18 20:56:12 adamdunkels Exp $
  */
 
 /**
@@ -143,7 +143,11 @@ PROCESS_THREAD(shell_sense_process, ev, data)
 
   msg.len = 7;
   msg.clock = clock_time();
+#if TIMESYNCH_CONF_ENABLED
   msg.timesynch_time = timesynch_time();
+#else /* TIMESYNCH_CONF_ENABLED */
+  msg.timesynch_time = 0;
+#endif /* TIMESYNCH_CONF_ENABLED */
   msg.light1 = light_sensor.value(0);
   msg.light2 = light_sensor.value(1);
   msg.temp = sht11_temp();