diff --git a/examples/z1/Makefile b/examples/z1/Makefile
new file mode 100644
index 000000000..c8fb5dd29
--- /dev/null
+++ b/examples/z1/Makefile
@@ -0,0 +1,8 @@
+CONTIKI = ../..
+ifndef TARGET
+TARGET=z1
+endif
+
+all: test-phidget blink
+
+include $(CONTIKI)/Makefile.include
diff --git a/examples/z1/test-phidgets.c b/examples/z1/test-phidgets.c
new file mode 100644
index 000000000..36f8bc6f2
--- /dev/null
+++ b/examples/z1/test-phidgets.c
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2007, 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: test-phidgets.c,v 1.1 2010/08/27 12:51:41 joxe Exp $
+ */
+
+/**
+ * \file
+ *         An example of how to use the button and light sensor on
+ *         the Z1 platform.
+ * \author
+ *         Joakim Eriksson <joakime@sics.se>
+ */
+
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/button-sensor.h"
+#include "dev/leds.h"
+#include "dev/z1-phidgets.h"
+#include <stdio.h>
+
+/*---------------------------------------------------------------------------*/
+PROCESS(test_button_process, "Test button");
+AUTOSTART_PROCESSES(&test_button_process);
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(test_button_process, ev, data)
+{
+  static struct etimer et;
+  PROCESS_BEGIN();
+  SENSORS_ACTIVATE(phidgets);
+
+  while(1) {
+    etimer_set(&et, CLOCK_SECOND/2);
+
+    PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+    leds_toggle(LEDS_GREEN);
+    printf("Button clicked\n");
+    printf("Phidget 5V 1:%d\n", phidgets.value(PHIDGET5V_1));
+    printf("Phidget 5V 2:%d\n", phidgets.value(PHIDGET5V_2));
+    printf("Phidget 3V 1:%d\n", phidgets.value(PHIDGET3V_1));
+    printf("Phidget 3V 2:%d\n", phidgets.value(PHIDGET3V_2));
+
+    if (phidgets.value(PHIDGET3V_1) < 100) {
+      leds_on(LEDS_RED);
+    } else {
+      leds_off(LEDS_RED);
+    }
+
+  }
+  PROCESS_END();
+}
+/*---------------------------------------------------------------------------*/