diff --git a/tools/cooja/apps/collect-view/build.xml b/tools/cooja/apps/collect-view/build.xml
index fd0c01611..71d483c6f 100644
--- a/tools/cooja/apps/collect-view/build.xml
+++ b/tools/cooja/apps/collect-view/build.xml
@@ -2,6 +2,7 @@
 
 <project name="COOJA: CollectView" default="jar" basedir=".">
   <property name="cooja" value="../../dist/cooja.jar"/>
+  <property name="archive" value="cooja-collect-view.jar"/>
 
   <target name="init">
     <tstamp/>
@@ -17,12 +18,13 @@
   </target>
 
   <target name="clean" depends="init">
-    <delete dir="build" file="collect-view.jar"/>
+    <delete dir="build" file="${archive}"/>
   </target>
 
-  <target name="jar" depends="clean, init, compile">
-    <jar destfile="collect-view.jar" basedir="build" />
-    <ant antfile="build.xml" dir="../../../../tools/collect-view" target="dist" inheritAll="false"/>
+  <target name="jar" depends="compile">
+    <jar destfile="${archive}" basedir="build" />
+    <ant antfile="build.xml" dir="../../../../tools/collect-view" target="jar"
+         inheritAll="false"/>
   </target>
 
 </project>
diff --git a/tools/cooja/apps/collect-view/cooja.config b/tools/cooja/apps/collect-view/cooja.config
index 700d92b58..4e423538b 100644
--- a/tools/cooja/apps/collect-view/cooja.config
+++ b/tools/cooja/apps/collect-view/cooja.config
@@ -1,2 +1,2 @@
 se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.plugins.collectview.CollectView
-se.sics.cooja.GUI.JARFILES = + collect-view.jar
+se.sics.cooja.GUI.JARFILES = + cooja-collect-view.jar
diff --git a/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java b/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
index bef434774..a7d40a6d0 100644
--- a/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
+++ b/tools/cooja/apps/collect-view/java/se/sics/cooja/plugins/collectview/CollectView.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CollectView.java,v 1.3 2010/11/10 20:46:57 adamdunkels Exp $
+ * $Id: CollectView.java,v 1.4 2010/11/12 16:50:38 nifi Exp $
  */
 package se.sics.cooja.plugins.collectview;
 import java.awt.BorderLayout;
@@ -116,7 +116,7 @@ public class CollectView extends VisPlugin implements MotePlugin, HasQuickHelp {
     }
 
     String contikiPath = GUI.getExternalToolsSetting("PATH_CONTIKI", "../../..");
-    String jarFile = contikiPath + "/tools/collect-view/dist/collect-demo.jar";
+    String jarFile = contikiPath + "/tools/collect-view/dist/collect-view.jar";
     if (!new File(jarFile).canRead()) {
       logger.fatal("Could not find the CollectView application:" + jarFile);
       if (GUI.isVisualized()) {
diff --git a/tools/cooja/build.xml b/tools/cooja/build.xml
index 9d9e38693..f57d0f82a 100644
--- a/tools/cooja/build.xml
+++ b/tools/cooja/build.xml
@@ -91,6 +91,7 @@ The COOJA Simulator
     <ant antfile="build.xml" dir="apps/mspsim" target="clean" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/avrora" target="clean" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/serial_socket" target="clean" inheritAll="false"/>
+    <ant antfile="build.xml" dir="apps/collect-view" target="clean" inheritAll="false"/>
   </target>
 
   <target name="run" depends="init, compile, jar, copy configs">
@@ -163,6 +164,7 @@ The COOJA Simulator
     <ant antfile="build.xml" dir="apps/mspsim" target="jar" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/avrora" target="jar" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/serial_socket" target="jar" inheritAll="false"/>
+    <ant antfile="build.xml" dir="apps/collect-view" target="jar" inheritAll="false"/>
   </target>
 
   <target name="run_nogui" depends="init, compile, jar, copy configs">
diff --git a/tools/cooja/config/external_tools_freebsd.config b/tools/cooja/config/external_tools_freebsd.config
index 97e9083b8..b56586733 100644
--- a/tools/cooja/config/external_tools_freebsd.config
+++ b/tools/cooja/config/external_tools_freebsd.config
@@ -21,7 +21,7 @@ AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
 
 PARSE_WITH_COMMAND=false
 PARSE_COMMAND=nm -a $(LIBFILE)
diff --git a/tools/cooja/config/external_tools_linux.config b/tools/cooja/config/external_tools_linux.config
index 76b05ca4a..9338eebb1 100644
--- a/tools/cooja/config/external_tools_linux.config
+++ b/tools/cooja/config/external_tools_linux.config
@@ -21,7 +21,7 @@ AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
 
 PARSE_WITH_COMMAND=false
 PARSE_COMMAND=nm -a $(LIBFILE)
diff --git a/tools/cooja/config/external_tools_linux_64.config b/tools/cooja/config/external_tools_linux_64.config
index 0228ff1a7..e1c198439 100644
--- a/tools/cooja/config/external_tools_linux_64.config
+++ b/tools/cooja/config/external_tools_linux_64.config
@@ -21,7 +21,7 @@ AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
 
 PARSE_WITH_COMMAND=false
 PARSE_COMMAND=nm -a $(LIBFILE)
diff --git a/tools/cooja/config/external_tools_macosx.config b/tools/cooja/config/external_tools_macosx.config
index fb14d49e9..3e9f0ceb3 100644
--- a/tools/cooja/config/external_tools_macosx.config
+++ b/tools/cooja/config/external_tools_macosx.config
@@ -21,7 +21,7 @@ AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
 
 PARSE_WITH_COMMAND = true
 PARSE_COMMAND = /opt/contiki-2.x/tools/cooja/examples/jni_test/mac_users/nmandsize $(LIBFILE)
diff --git a/tools/cooja/config/external_tools_win32.config b/tools/cooja/config/external_tools_win32.config
index bf7290e63..dd0477ec9 100644
--- a/tools/cooja/config/external_tools_win32.config
+++ b/tools/cooja/config/external_tools_win32.config
@@ -21,7 +21,7 @@ AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view
 
 PARSE_WITH_COMMAND = true
 PARSE_COMMAND=nm -C $(LIBFILE)