diff --git a/apps/platypus-demo/Makefile b/apps/platypus-demo/Makefile
new file mode 100644
index 000000000000..22f85949137d
--- /dev/null
+++ b/apps/platypus-demo/Makefile
@@ -0,0 +1,35 @@
+# name of your application
+APPLICATION = platypus-demo
+
+# If no BOARD is found in the environment, use this default:
+BOARD ?= platypus-demo
+
+# This has to be the absolute path to the RIOT base directory:
+RIOTBASE ?= $(CURDIR)/../..
+
+# Uncomment these lines if you want to use platform support from external
+# repositories:
+#RIOTCPU ?= $(CURDIR)/../../RIOT/thirdparty_cpu
+#RIOTBOARD ?= $(CURDIR)/../../RIOT/thirdparty_boards
+
+# Uncomment this to enable scheduler statistics for ps:
+#CFLAGS += -DSCHEDSTATISTICS
+
+# If you want to use native with valgrind, you should recompile native
+# with the target all-valgrind instead of all:
+# make -B clean all-valgrind
+
+# Comment this out to disable code in RIOT that does safety checking
+# which is not needed in a production environment but helps in the
+# development process:
+CFLAGS += -DDEVELHELP
+#CFLAGS += -O0
+#CFLAGS += -DLOG_LEVEL=LOG_NONE
+
+# Change this to 0 show compiler invocation lines by default:
+QUIET ?= 1
+
+# Modules to include:
+# include and auto-initialize all available sensors
+
+include $(RIOTBASE)/Makefile.include
diff --git a/apps/platypus-demo/main.c b/apps/platypus-demo/main.c
new file mode 100644
index 000000000000..611ce9d7a47d
--- /dev/null
+++ b/apps/platypus-demo/main.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008, 2009, 2010  Kaspar Schleiser <kaspar@schleiser.de>
+ * Copyright (C) 2013 INRIA
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     examples
+ * @{
+ *
+ * @file
+ * @brief       Default application that shows a lot of functionality of RIOT
+ *
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
+ * @author      Oliver Hahm <oliver.hahm@inria.fr>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
+ *
+ * @}
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "thread.h"
+
+int main(void)
+{
+    while(1);
+
+    return 0;
+}