diff --git a/platform/sky/Makefile b/platform/sky/Makefile
index 43a17c5ff..555b3500d 100644
--- a/platform/sky/Makefile
+++ b/platform/sky/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2007/04/26 13:39:52 bg- Exp $
+# $Id: Makefile,v 1.14 2007/05/21 14:21:07 bg- Exp $
 #
 # This makefile requires GNU make!
 
@@ -26,7 +26,7 @@ MCU=msp430x1611
 ARCH=msp430.o minileds.o watchdog.o light.o button.o spi.o ds2411.o rom.o xmem.o i2c.o cle_msp430.o
 SYSTEM=process.o procinit.o service.o clock.o etimer.o timer.o \
         cmod.o cle.o sym.o
-UIP=uip.o uiplib.o tcpip.o uip-fw.o uip-fw-service.o uipbuf.o \
+UIP=uip.o uiplib.o tcpip.o uip-fw.o uip-fw-drv.o uipbuf.o \
     tcpdump.o psock.o dhcpc.o uaodv.o uaodv-rt.o uip-udp-packet.o \
     uip-ipchksum.o
 UIPDRIVERS=slip.o slip_uart1.o \
@@ -104,7 +104,7 @@ test.out: test.o $(LIB)
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
 
 depend: $(LIBFILES:.o=.c)
-	-$(CC) $(CCDEPFLAGS) -MM $(CFLAGS) $(INCDIRS) $^ *.c >Makefile.depend
+	-$(CC) $(CCDEPFLAGS) -MM $(CFLAGS) $(INCDIRS) $^ >Makefile.depend
 
 tags: $(LIBFILES:.o=.c)
 	etags $^
diff --git a/platform/sky/client.c b/platform/sky/client.c
index 2492ffaf5..ef2e08823 100644
--- a/platform/sky/client.c
+++ b/platform/sky/client.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: client.c,v 1.6 2007/04/11 10:13:59 bg- Exp $
+ * @(#)$Id: client.c,v 1.7 2007/05/21 14:21:35 bg- Exp $
  */
 
 /*
@@ -61,7 +61,7 @@
 #include "contiki.h"
 
 /* Also IP output. */
-#include "net/uip-fw-service.h"
+#include "net/uip-fw-drv.h"
 #include "net/uaodv.h"
 #include "dev/slip.h"
 #include "dev/cc2420.h"
@@ -106,7 +106,7 @@ main(int argc, char **argv)
   leds_toggle(LEDS_ALL);
   slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
   printf("Starting %s "
-	 "($Id: client.c,v 1.6 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__);
+	 "($Id: client.c,v 1.7 2007/05/21 14:21:35 bg- Exp $)\n", __FILE__);
   ds2411_init();
   sensors_light_init();
   cc2420_init();
diff --git a/platform/sky/dhclient.c b/platform/sky/dhclient.c
index 7ac0f2185..9af423ad9 100644
--- a/platform/sky/dhclient.c
+++ b/platform/sky/dhclient.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
  *
- * @(#)$Id: dhclient.c,v 1.9 2007/04/11 10:13:59 bg- Exp $
+ * @(#)$Id: dhclient.c,v 1.10 2007/05/21 14:21:53 bg- Exp $
  */
 
 /*
@@ -57,7 +57,7 @@
 #include "contiki.h"
 
 /* Also IP output. */
-#include "net/uip-fw-service.h"
+#include "net/uip-fw-drv.h"
 #include "net/uaodv.h"
 #include "net/dhcpc.h"
 #include "dev/slip.h"
@@ -102,7 +102,7 @@ main(int argc, char **argv)
   leds_toggle(LEDS_ALL);
   slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
   printf("Starting %s "
-	 "($Id: dhclient.c,v 1.9 2007/04/11 10:13:59 bg- Exp $)\n", __FILE__);
+	 "($Id: dhclient.c,v 1.10 2007/05/21 14:21:53 bg- Exp $)\n", __FILE__);
   ds2411_init();
   sensors_light_init();
   cc2420_init();