diff --git a/examples/sky-ip/Makefile b/examples/sky-ip/Makefile
index 25e30d9ee..ecd363a05 100644
--- a/examples/sky-ip/Makefile
+++ b/examples/sky-ip/Makefile
@@ -1,7 +1,7 @@
 CONTIKI_PROJECT = sky-webserver
 all: $(CONTIKI_PROJECT)
 
-APPS = telnetd webserver
+APPS = webserver twitter telnetd
 CFLAGS = -DWITH_UIP=1 -I. #-DWITH_NULLMAC=1
 
 # The webserver application normally contains a built-in file system and support
@@ -11,10 +11,10 @@ CFLAGS = -DWITH_UIP=1 -I. #-DWITH_NULLMAC=1
 # which serves files from an cfs file system. To build the alternative webserver
 # run make with the parameter HTTPD-CFS=1.
 
-ifeq ($(HTTPD-CFS),1)
-override webserver_src = webserver-nogui.c http-strings.c psock.c memb.c \
-                         httpd-cfs.c
-endif
+# ifeq ($(HTTPD-CFS),1)
+# override webserver_src = webserver-nogui.c http-strings.c psock.c memb.c \
+#                          httpd-cfs.c
+# endif
 
 CONTIKI = ../..
 include $(CONTIKI)/Makefile.include
@@ -31,15 +31,15 @@ sky-webserver.$(TARGET): $(OBJECTDIR)/ajax-cgi.o
 # so the existence of the "wrong" object file is used to detect a switch and
 # trigger deletion of the Contiki library - and the trigger file of course.
 
-ifeq ($(HTTPD-CFS),1)
-  ifneq (${wildcard $(OBJECTDIR)/httpd.o},)
-  DUMMY := ${shell rm -f contiki-$(TARGET).a $(OBJECTDIR)/httpd.o}
-  endif
-else
-  ifneq (${wildcard $(OBJECTDIR)/httpd-cfs.o},)
-  DUMMY := ${shell rm -f contiki-$(TARGET).a $(OBJECTDIR)/httpd-cfs.o}
-  endif
-endif
+# ifeq ($(HTTPD-CFS),1)
+#   ifneq (${wildcard $(OBJECTDIR)/httpd.o},)
+#   DUMMY := ${shell rm -f contiki-$(TARGET).a $(OBJECTDIR)/httpd.o}
+#   endif
+# else
+#   ifneq (${wildcard $(OBJECTDIR)/httpd-cfs.o},)
+#   DUMMY := ${shell rm -f contiki-$(TARGET).a $(OBJECTDIR)/httpd-cfs.o}
+#   endif
+# endif
 
 slip:
 ifdef INTERFACE
diff --git a/examples/sky-ip/telnet-tweet.c b/examples/sky-ip/telnet-tweet.c
new file mode 100644
index 000000000..6ae48ca8e
--- /dev/null
+++ b/examples/sky-ip/telnet-tweet.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2006, 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: telnet-tweet.c,v 1.1 2009/05/11 17:36:13 adamdunkels Exp $
+ */
+
+/**
+ * \file
+ *         Multi-hop telnetd for the Tmote Sky
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#include "telnetd.h"
+#include "shell.h"
+
+#include "contiki.h"
+#include "contiki-net.h"
+#include "net/rime.h"
+#include <stdio.h>
+
+/*---------------------------------------------------------------------------*/
+PROCESS(sky_telnetd_process, "Sky telnet process");
+AUTOSTART_PROCESSES(&telnetd_process, &sky_telnetd_process);
+/*---------------------------------------------------------------------------*/
+PROCESS_THREAD(sky_telnetd_process, ev, data)
+{
+  PROCESS_BEGIN();
+
+  PROCESS_PAUSE();
+
+  shell_blink_init();
+  /*  shell_file_init();
+      shell_coffee_init();*/
+  /*    shell_netfile_init();*/
+  shell_ps_init();
+  shell_ping_init();
+  shell_reboot_init();
+  /*  shell_rime_init();
+  shell_rime_ping_init();
+  shell_rime_netcmd_init();
+  shell_rime_sniff_init();*/
+  shell_power_init();
+  shell_sky_init();
+  shell_text_init();
+  shell_time_init();
+
+  /*  shell_wget_init();*/
+
+  shell_rime_neighbors_init();
+  
+  shell_tweet_init();
+  shell_sensortweet_init();
+  
+  while(1) {
+    PROCESS_WAIT_EVENT();
+  }
+  
+  PROCESS_END();
+    
+}
+/*---------------------------------------------------------------------------*/