diff --git a/config.h.contiki b/config.h.contiki
index 08d980b2..72bfca41 100644
--- a/config.h.contiki
+++ b/config.h.contiki
@@ -58,18 +58,24 @@
 
 #if defined(PLATFORM) && PLATFORM == PLATFORM_MC1322X
 /* Redbee econotags get a special treatment here: endianness is set
- * explicitly, and assert() is defined as emtpy directive unless
- * HAVE_ASSERT_H is given.
+ * explicitly, and 
  */ 
 
 #define BYTE_ORDER UIP_LITTLE_ENDIAN
 
-#ifndef HAVE_ASSERT_H
-# define assert(x)
-#endif
-
+#undef HAVE_ASSERT_H
+#define HAVE_UNISTD_H
 #endif /* defined(PLATFORM) && PLATFORM == PLATFORM_MC1322X */
 
+#if defined(TMOTE_SKY)
+/* Need to set the byte order for TMote Sky explicitely */
+
+#define BYTE_ORDER UIP_LITTLE_ENDIAN
+
+typedef int ssize_t;
+#undef HAVE_ASSERT_H
+#endif /* defined(TMOTE_SKY) */
+
 #ifndef BYTE_ORDER
 # ifdef UIP_CONF_BYTE_ORDER
 #  define BYTE_ORDER UIP_CONF_BYTE_ORDER
@@ -78,5 +84,10 @@
 # endif /* UIP_CONF_BYTE_ORDER */
 #endif /* BYTE_ORDER */
 
+/* Define assert() as emtpy directive unless HAVE_ASSERT_H is given. */
+#ifndef HAVE_ASSERT_H
+# define assert(x)
+#endif
+
 #endif /* _CONFIG_H_ */