diff --git a/platform/z1/dev/cc2420-arch.c b/platform/z1/dev/cc2420-arch.c
index bc345e29f..929a1e0e6 100644
--- a/platform/z1/dev/cc2420-arch.c
+++ b/platform/z1/dev/cc2420-arch.c
@@ -34,13 +34,17 @@
 #include "cc2420.h"
 #include "isr_compat.h"
 
+#ifdef CC2420_CONF_SFD_TIMESTAMPS
+#define CONF_SFD_TIMESTAMPS CC2420_CONF_SFD_TIMESTAMPS
+#endif /* CC2420_CONF_SFD_TIMESTAMPS */
+
 #ifndef CONF_SFD_TIMESTAMPS
 #define CONF_SFD_TIMESTAMPS 0
 #endif /* CONF_SFD_TIMESTAMPS */
 
 #ifdef CONF_SFD_TIMESTAMPS
 #include "cc2420-arch-sfd.h"
-#endif
+#endif /* CONF_SFD_TIMESTAMPS */
 
 /*---------------------------------------------------------------------------*/
 #if 0
@@ -67,7 +71,7 @@ cc2420_arch_init(void)
 
 #if CONF_SFD_TIMESTAMPS
   cc2420_arch_sfd_init();
-#endif
+#endif /* CONF_SFD_TIMESTAMPS */
 
   CC2420_SPI_DISABLE();                /* Unselect radio. */
 }