diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index fe0d5c9f5..ffdc53191 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: contiki-conf.h,v 1.12 2010/03/09 08:14:06 fros4943 Exp $
+ * $Id: contiki-conf.h,v 1.13 2010/03/10 07:35:49 fros4943 Exp $
  *
  */
 
@@ -40,13 +40,26 @@
 
 #define COOJA 1
 
-/* Fixed network setup */
+
+#ifdef NETSTACK_CONF_H
+
+#define NETSTACK__QUOTEME(s) NETSTACK_QUOTEME(s)
+#define NETSTACK_QUOTEME(s) #s
+#include NETSTACK__QUOTEME(NETSTACK_CONF_H)
+
+#else /* NETSTACK_CONF_H */
+
+/* Default network config: Rime */
+/* These settings may be overriden by NETSTACK_CONF_H below */
 #define NETSTACK_CONF_NETWORK rime_driver
 #define NETSTACK_CONF_MAC nullmac_driver
 #define NETSTACK_CONF_RDC nullrdc_driver
 #define NETSTACK_CONF_RADIO cooja_radio_driver
 /*#define NETSTACK_CONF_FRAMER framer_nullmac*/
 
+#endif /* NETSTACK_CONF_H */
+
+
 #define PACKETBUF_CONF_ATTRS_INLINE 1
 
 #define QUEUEBUF_CONF_NUM 16
diff --git a/platform/cooja/netstack-conf-example.h b/platform/cooja/netstack-conf-example.h
new file mode 100644
index 000000000..d2e53c79e
--- /dev/null
+++ b/platform/cooja/netstack-conf-example.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this list of conditions and the following
+ *    disclaimer in the documentation and/or other materials provided
+ *    with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: netstack-conf-example.h,v 1.1 2010/03/10 07:35:49 fros4943 Exp $
+ *
+ */
+
+#ifndef __NETSTACK_CONF_H
+#define __NETSTACK_CONF_H
+
+#define NETSTACK_CONF_NETWORK rime_driver
+#define NETSTACK_CONF_MAC nullmac_driver
+#define NETSTACK_CONF_RDC nullrdc_driver
+#define NETSTACK_CONF_RADIO cooja_radio_driver
+/*#define NETSTACK_CONF_FRAMER framer_nullmac*/
+
+#endif /* __NETSTACK_CONF_H */