diff --git a/core/net/rime/collect.c b/core/net/rime/collect.c
index 16a37673f..696ce2fd2 100644
--- a/core/net/rime/collect.c
+++ b/core/net/rime/collect.c
@@ -33,7 +33,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: collect.c,v 1.66 2010/11/06 14:32:10 adamdunkels Exp $
+ * $Id: collect.c,v 1.67 2010/12/14 22:14:33 dak664 Exp $
  */
 
 /**
@@ -1277,7 +1277,11 @@ collect_open(struct collect_conn *tc, uint16_t channels,
   neighbor_discovery_open(&tc->neighbor_discovery_conn, channels,
 			  CLOCK_SECOND * 4,
 			  CLOCK_SECOND * 60,
-                          CLOCK_SECOND * 600UL,
+#ifdef COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME
+              COLLECT_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME,
+#else
+              CLOCK_SECOND * 600UL,
+#endif
 			  &neighbor_discovery_callbacks);
   neighbor_discovery_start(&tc->neighbor_discovery_conn, tc->rtmetric);
 #else /* !COLLECT_ANNOUNCEMENTS */