diff --git a/platform/win32/Makefile b/platform/win32/Makefile
index fe8f3f29a..97e074d48 100644
--- a/platform/win32/Makefile
+++ b/platform/win32/Makefile
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile,v 1.7 2007/12/15 00:00:34 oliverschmidt Exp $
+# $Id: Makefile,v 1.8 2008/02/09 18:56:26 oliverschmidt Exp $
 #
 
 PRGS = about calc dhcp directory email ftp irc netconf processes shell \
@@ -41,8 +41,17 @@ all: contiki-main $(PRGS:=.prg) $(DSCS:=.dsc)
 
 appname = ${subst processes,process-list,${subst www,webbrowser,$(1)}}
 
+# Omit all the target and network stack specific shell commands
+SHELL_SOURCEFILES = shell.c shell-file.c shell-ps.c shell-run.c \
+		    shell-text.c shell-time.c list.c random.c
+		    
+# Use gui-shell.c instead of serial-shell.c to get CTK support
+override shell_src = gui-shell.c ctk-textentry-cmdline.c \
+		     $(SHELL_SOURCEFILES)
+
 # Add telnetd-gui.c to get CTK support
-override telnetd_src = telnetd.c telnetd-gui.c memb.c shell.c
+override telnetd_src = telnetd.c telnetd-gui.c memb.c \
+		       $(SHELL_SOURCEFILES)
 
 # Use webserver.c instead of webserver-nogui.c to get CTK support
 override webserver_src = webserver.c httpd.c http-strings.c psock.c \