diff --git a/platform/sensinode/Makefile.sensinode b/platform/sensinode/Makefile.sensinode
new file mode 100644
index 000000000..f8d259e28
--- /dev/null
+++ b/platform/sensinode/Makefile.sensinode
@@ -0,0 +1,44 @@
+# Sensinode CC2430 platform makefile
+# Supported products: N100, N600, N601, N710, N711
+
+# /dev supports defines for product models using the following format
+# e.g. MODEL_N601. Run make TARGET=sensinode DEFINES=MODEL_N601 to 
+# automatically configure the correct LED, button, UART etc. settings
+# for that product model. If no model is defined, MODEL_N100 is chosen by default.
+# Models settings are defined in /dev/models.h
+
+# make sensinode.upload - Will use nano_programmer to upload file using D2xx Devboard
+# make sensinode.serialdump - Will use the Contiki serialdump tool on the default UART
+
+ifndef CONTIKI
+  $(error CONTIKI not defined! You must specify where CONTIKI resides!)
+endif
+
+RIME_CONF_NO_POLITE_ANNOUCEMENTS = 1
+
+# Define the default UART for tools and tool commands
+DEFUART = /dev/ttyUSB0
+PROG = $(CONTIKI)/tools/sensinode/nano_programmer/nano_programmer -d $(DEFUART)
+SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux -b115200 $(DEFUART)
+
+CONTIKI_TARGET_DIRS = . dev
+CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-sesinode-main.o}
+
+CONTIKI_TARGET_SOURCEFILES = contiki-sensinode-main.c \
+                             leds.c leds-arch.c serial-line.c
+
+CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
+
+.SUFFIXES:
+
+%.upload: %.ihx
+	$(PROG) -P $<
+
+sensinode.serialdump:
+	$(SERIALDUMP)
+
+### Define the CPU directory
+CONTIKI_CPU=$(CONTIKI)/cpu/cc2430
+include $(CONTIKI)/cpu/cc2430/Makefile.cc2430
+
+contiki-$(TARGET).a:# ${addprefix $(OBJECTDIR)/,symbols.o}
diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h
new file mode 100644
index 000000000..2f8148ae5
--- /dev/null
+++ b/platform/sensinode/contiki-conf.h
@@ -0,0 +1,29 @@
+
+#ifndef __CONTIKI_CONF_H__
+#define __CONTIKI_CONF_H__
+
+#include "8051def.h"
+#include "sys/cc.h"
+#include <ctype.h>
+#include <string.h>
+#include "log.h"
+
+/* Time type. */
+/*typedef unsigned long clock_time_t;*/
+typedef unsigned short clock_time_t;
+
+/* Defines tick counts for a second. */
+#define CLOCK_CONF_SECOND		128
+
+#define rtimer_arch_now()	clock_time()
+
+/* Memory filesystem RAM size. */
+#define CFS_RAM_CONF_SIZE		512
+
+/* Logging.. */
+#define LOG_CONF_ENABLED		0
+
+/* XXX argh, ugly hack to make stuff compile! */
+#define snprintf(BUF, SIZE, ...) sprintf(BUF, __VA_ARGS__)
+
+#endif /* __CONTIKI_CONF_H__ */
diff --git a/platform/sensinode/contiki-sensinode-main.c b/platform/sensinode/contiki-sensinode-main.c
new file mode 100644
index 000000000..bcfba05d6
--- /dev/null
+++ b/platform/sensinode/contiki-sensinode-main.c
@@ -0,0 +1,136 @@
+#include <stdio.h>
+
+#include "contiki.h"
+#include "sys/clock.h"
+#include "sys/autostart.h"
+
+#include "dev/serial-line.h"
+#include "dev/bus.h"
+#include "dev/leds.h"
+#include "dev/uart.h"
+#include "dev/models.h"
+#include "dev/cc2430_rf.h"
+#include "net/mac/nullmac.h"
+#include "net/rime.h"
+
+volatile int i, a;
+unsigned short node_id = 2;			/* Manually sets MAC address when > 0 */
+
+/*---------------------------------------------------------------------------*/
+static void
+print_processes(struct process * const processes[])
+{
+  printf("Starting");
+  while(*processes != NULL) {
+    printf(" '%s'", (*processes)->name);
+    processes++;
+  }
+  printf("\n");
+}
+/*---------------------------------------------------------------------------*/
+void
+putchar(char c)
+{
+  /* UART1 used for debugging on Sensinode products. */
+  uart1_writeb(c);
+}
+/*---------------------------------------------------------------------------*/
+static void
+fade(int l)
+{
+  int k, j;
+  for(k = 0; k < 400; ++k) {
+    j = k > 200? 400 - k: k;
+
+    leds_on(l);
+    for(i = 0; i < j; ++i) {
+      a = i;
+    }
+    leds_off(l);
+    for(i = 0; i < 200 - j; ++i) {
+      a = i;
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+set_rime_addr(void)
+{
+  rimeaddr_t addr;
+  uint8_t ft_buffer[8];
+  int i;
+
+  /* TODO: This flash_read routine currently gets a different address
+   * than nano_programmer -m... something broken or misconfigured...
+   */
+
+  flash_read(&ft_buffer[0], 0x1FFF8, 8);
+
+  printf("Read MAC from flash: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
+	 ft_buffer[0], ft_buffer[1], ft_buffer[2], ft_buffer[3],
+	 ft_buffer[4], ft_buffer[5], ft_buffer[6], ft_buffer[7]);
+
+  memset(&addr, 0, sizeof(rimeaddr_t));
+
+#if UIP_CONF_IPV6
+  memcpy(addr.u8, ft_buffer, sizeof(addr.u8));
+#else
+  if(node_id == 0) {
+    for(i = 0; i < sizeof(rimeaddr_t); ++i) {
+      addr.u8[i] = ft_buffer[7 - i];
+    }
+  } else {
+    printf("Setting manual address from node_id\n");
+    addr.u8[0] = node_id >> 8;
+    addr.u8[1] = node_id & 0xff;
+  }
+#endif
+
+  rimeaddr_set_node_addr(&addr);
+  printf("Rime configured with address ");
+  for(i = 0; i < sizeof(addr.u8) - 1; i++) {
+    printf("%02x:", addr.u8[i]);
+  }
+  printf("%02x\n", addr.u8[i]);
+}
+/*---------------------------------------------------------------------------*/
+int
+main(void)
+{
+
+  /* Hardware initialization */
+  bus_init();
+
+  leds_init();
+  fade(LEDS_GREEN);
+
+  uart1_init(115200);
+  uart1_set_input(serial_line_input_byte);
+
+  /* initialize process manager. */
+  process_init();
+
+  serial_line_init();
+
+  printf("\n" CONTIKI_VERSION_STRING " started\n");
+  printf("model: " SENSINODE_MODEL "\n\n");
+
+  /* initialize the radio driver */
+
+  cc2430_rf_init();
+  rime_init(nullmac_init(&cc2430_rf_driver));
+  set_rime_addr();
+
+  /* start services */
+  process_start(&etimer_process, NULL);
+
+  fade(LEDS_RED);
+
+  autostart_start(autostart_processes);
+
+  while(1) {
+    process_run();
+    etimer_request_poll();
+  }
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/sensinode/dev/adc-sensor.c b/platform/sensinode/dev/adc-sensor.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/platform/sensinode/dev/button-sensor.c b/platform/sensinode/dev/button-sensor.c
new file mode 100644
index 000000000..deccf2290
--- /dev/null
+++ b/platform/sensinode/dev/button-sensor.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2005, 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. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ * @(#)$Id: button-sensor.c,v 1.1 2009/09/08 20:06:28 zdshelby Exp $
+ */
+
+#include "lib/sensors.h"
+/*#include "dev/hwconf.h"*/
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+
+const struct sensors_sensor button_sensor;
+
+static struct timer debouncetimer;
+
+/*
+HWCONF_PIN(BUTTON, 2, 7);
+HWCONF_IRQ(BUTTON, 2, 7);
+*/
+
+/*---------------------------------------------------------------------------*/
+static void
+init(void)
+{
+  timer_set(&debouncetimer, 0);
+  BUTTON_IRQ_EDGE_SELECTD();
+
+  BUTTON_SELECT();
+  BUTTON_MAKE_INPUT();
+}
+/*---------------------------------------------------------------------------*/
+static int
+irq(void)
+{
+  if(BUTTON_CHECK_IRQ()) {
+    if(timer_expired(&debouncetimer)) {
+      timer_set(&debouncetimer, CLOCK_SECOND / 4);
+      sensors_changed(&button_sensor);
+      return 1;
+    }
+  }
+
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void
+activate(void)
+{
+  sensors_add_irq(&button_sensor, BUTTON_IRQ_PORT());
+  BUTTON_ENABLE_IRQ();
+}
+/*---------------------------------------------------------------------------*/
+static void
+deactivate(void)
+{
+  BUTTON_DISABLE_IRQ();
+  sensors_remove_irq(&button_sensor, BUTTON_IRQ_PORT());
+}
+/*---------------------------------------------------------------------------*/
+static int
+active(void)
+{
+  return BUTTON_IRQ_ENABLED();
+}
+/*---------------------------------------------------------------------------*/
+static unsigned int
+value(int type)
+{
+  return BUTTON_READ() || !timer_expired(&debouncetimer);
+}
+/*---------------------------------------------------------------------------*/
+static int
+configure(int type, void *c)
+{
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+static void *
+status(int type)
+{
+  return NULL;
+}
+/*---------------------------------------------------------------------------*/
+SENSORS_SENSOR(button_sensor, BUTTON_SENSOR,
+	       init, irq, activate, deactivate, active,
+	       value, configure, status);
diff --git a/platform/sensinode/dev/leds-arch.c b/platform/sensinode/dev/leds-arch.c
new file mode 100644
index 000000000..08616f98b
--- /dev/null
+++ b/platform/sensinode/dev/leds-arch.c
@@ -0,0 +1,49 @@
+#include "contiki-conf.h"
+#include "dev/models.h"
+#include "dev/leds.h"
+
+#include "cc2430_sfr.h"
+
+/*
+ * Sensinode v1.0 HW products have 2 red LEDs, LED1 is mapped to the Contiki
+ * LEDS_RED and LED2 is mapped to LEDS_GREEN.
+ */
+
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_init(void)
+{
+  P0DIR |= 0x30;
+}
+/*---------------------------------------------------------------------------*/
+unsigned char
+leds_arch_get(void)
+{
+  unsigned char l = 0;
+
+  if(LED1_PIN) {
+    l |= LEDS_RED;
+  }
+  if(LED2_PIN) {
+    l |= LEDS_GREEN;
+  }
+  return l;
+}
+/*---------------------------------------------------------------------------*/
+void
+leds_arch_set(unsigned char leds)
+{
+  if(leds & LEDS_RED) {
+    LED1_PIN = 1;
+  } else {
+    LED1_PIN = 0;
+  }
+
+  if(leds & LEDS_GREEN) {
+    LED2_PIN = 1;
+  } else {
+    LED2_PIN = 0;
+  }
+
+}
+/*---------------------------------------------------------------------------*/
diff --git a/platform/sensinode/dev/models.h b/platform/sensinode/dev/models.h
new file mode 100644
index 000000000..22e1e99f5
--- /dev/null
+++ b/platform/sensinode/dev/models.h
@@ -0,0 +1,44 @@
+#ifndef __MODELS_H__
+#define __MODELS_H__
+
+/* Define model text */
+#ifdef MODEL_N100
+#define SENSINODE_MODEL "N100 Module (CC2431-F128)"
+#endif
+#ifdef MODEL_N600
+#define SENSINODE_MODEL "N600 NanoRouter USB (CC2430-F128)"
+#endif
+#ifdef MODEL_N601
+#define SENSINODE_MODEL "N601 NanoRouter USB (CC2431-F128)"
+#endif
+#ifdef MODEL_N710
+#define SENSINODE_MODEL "N710 NanoSensor (CC2430-F128)"
+#endif
+#ifdef MODEL_N711
+#define SENSINODE_MODEL "N711 NanoSensor (CC2431-F128)"
+#endif
+
+#ifndef SENSINODE_MODEL
+#define MODEL_N100
+#define SENSINODE_MODEL "Sensinode N100 (CC2431-F128)"
+#endif
+
+/* All current models use these LED pins */
+#define LED1_PIN 	P0_4
+#define LED2_PIN	P0_5
+
+/* Buttons */
+
+#ifdef MODEL_N711
+#define BUTTON1_PIN		P0_6
+#define BUTTON2_PIN		P0_7
+#endif
+
+/* Sensor pins */
+
+#ifdef MODEL_N711
+#define LIGHT_PIN		P0_0
+#define TEMP_PIN		P0_1
+#endif
+
+#endif /* __MODELS_H__ */