diff --git a/tools/cooja/apps/mspsim/build.xml b/tools/cooja/apps/mspsim/build.xml
index 0c3ebc73a..3df7e7097 100644
--- a/tools/cooja/apps/mspsim/build.xml
+++ b/tools/cooja/apps/mspsim/build.xml
@@ -5,11 +5,13 @@
   <property name="build" location="build"/>
   <property name="lib" location="lib"/>
   <property name="javadoc" location="javadoc"/>
-	<property name="cooja" location="../.."/>
+  <property name="cooja" location="../.."/>
   
-	<property name="cooja_jar" value="${cooja}/dist/cooja.jar"/>
+  <property name="cooja_jar" value="${cooja}/dist/cooja.jar"/>
   <property name="mspsim" location="../../../mspsim"/>
   <property name="mspsim_jar" value="${lib}/mspsim.jar"/>
+  <property name="coffee" location="../../../coffee-manager"/>
+  <property name="coffee_jar" value="${lib}/coffee.jar"/>
   <property name="cooja_mspsim_jar" value="${lib}/cooja_mspsim.jar"/>
 
   <target name="init">
@@ -27,10 +29,16 @@
     <copy todir="${lib}" file="${mspsim}/mspsim.jar" />
   </target>
 
-  <target name="compile" depends="init,mspsim">
+  <target name="coffee" depends="init">
+    <ant antfile="build.xml" dir="${coffee}" target="jar" inheritAll="false"/>
+    <copy todir="${lib}" file="${coffee}/coffee.jar" />
+  </target>
+
+  <target name="compile" depends="init,mspsim,coffee">
     <javac srcdir="${src}" destdir="${build}" debug="on">
       <classpath>
         <pathelement location="${mspsim_jar}"/>
+        <pathelement location="${coffee_jar}"/>
         <pathelement location="${cooja_jar}"/>
       </classpath>
     </javac>
@@ -43,6 +51,7 @@
       <fileset dir="${src}/" includes="**/*.java"/>
       <classpath>
         <pathelement location="${mspsim_jar}"/>
+        <pathelement location="${coffee_jar}"/>
         <pathelement location="${cooja_jar}"/>
       </classpath>
     </javadoc>
diff --git a/tools/cooja/apps/mspsim/cooja.config b/tools/cooja/apps/mspsim/cooja.config
index a0d48bbbc..94592120b 100644
--- a/tools/cooja/apps/mspsim/cooja.config
+++ b/tools/cooja/apps/mspsim/cooja.config
@@ -1,3 +1,3 @@
 se.sics.cooja.GUI.MOTETYPES = + se.sics.cooja.mspmote.ESBMoteType se.sics.cooja.mspmote.SkyMoteType
-se.sics.cooja.GUI.JARFILES = + cooja_mspsim.jar mspsim.jar
+se.sics.cooja.GUI.JARFILES = + cooja_mspsim.jar mspsim.jar coffee.jar
 se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.mspmote.plugins.MspCLI se.sics.cooja.mspmote.plugins.MspCodeWatcher se.sics.cooja.mspmote.plugins.MspStackWatcher se.sics.cooja.mspmote.plugins.MspCycleWatcher