diff --git a/apps/shell/Makefile.shell b/apps/shell/Makefile.shell
index 864afd80c..e8ea1c7fb 100644
--- a/apps/shell/Makefile.shell
+++ b/apps/shell/Makefile.shell
@@ -6,8 +6,9 @@ shell_src = shell.c shell-reboot.c \
             shell-rime-debug.c shell-coffee.c \
             shell-wget.c shell-httpd.c shell-irc.c \
             shell-checkpoint.c shell-power.c \
-            shell-tcpsend.c shell-udpsend.c shell-ping.c \
-            shell-rime-sendcmd.c shell-download.c
+            shell-tcpsend.c shell-udpsend.c shell-ping.c shell-netstat.c \
+            shell-rime-sendcmd.c shell-download.c shell-rime-neighbors.c \
+            shell-rime-unicast.c
             #shell-rsh.c
 shell_dsc = shell-dsc.c
 
diff --git a/apps/shell/shell-rime.h b/apps/shell/shell-rime.h
index 9ee574a6b..422f68f47 100644
--- a/apps/shell/shell-rime.h
+++ b/apps/shell/shell-rime.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell-rime.h,v 1.3 2009/04/16 14:33:47 fros4943 Exp $
+ * $Id: shell-rime.h,v 1.4 2009/05/10 21:05:22 adamdunkels Exp $
  */
 
 /**
@@ -75,4 +75,7 @@ void shell_rime_init(void);
 /* Rime channel used by the 'download' command, which uses 2 channels */
 #define SHELL_RIME_CHANNEL_DOWNLOAD SHELL_RIME_CHANNEL_SENDTEST + 1
 
+/* Announcement idenfied used by the 'neighbors' command, uses one idenfier */
+#define SHELL_RIME_ANNOUNCEMENT_IDENTIFIER_NEIGHBORS SHELL_RIME_CHANNEL_DOWNLOAD + 2
+
 #endif /* __SHELL_RIME_H__ */
diff --git a/apps/shell/shell.h b/apps/shell/shell.h
index 0aa233657..df3f59be5 100644
--- a/apps/shell/shell.h
+++ b/apps/shell/shell.h
@@ -48,7 +48,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell.h,v 1.16 2009/04/16 14:33:47 fros4943 Exp $
+ * $Id: shell.h,v 1.17 2009/05/10 21:05:06 adamdunkels Exp $
  */
 
 /**
@@ -363,15 +363,18 @@ struct shell_input {
 #include "shell-httpd.h"
 #include "shell-irc.h"
 #include "shell-netfile.h"
+#include "shell-netstat.h"
 #include "shell-ping.h"
 #include "shell-power.h"
 #include "shell-ps.h"
 #include "shell-reboot.h"
 #include "shell-rime-debug.h"
+#include "shell-rime-neighbors.h"
 #include "shell-rime-netcmd.h"
 #include "shell-rime-ping.h"
 #include "shell-rime-sendcmd.h"
 #include "shell-rime-sniff.h"
+#include "shell-rime-unicast.h"
 #include "shell-rime.h"
 #include "shell-rsh.h"
 #include "shell-run.h"