diff --git a/auto-complete.sh b/auto-complete.sh
index e1501fe..b70c6f2 100755
--- a/auto-complete.sh
+++ b/auto-complete.sh
@@ -4,7 +4,7 @@ function libs()
 {
   if [ "$1" != "" ]; 
   then
-    COMPREPLY=($(compgen -W "network-scanning help" "${COMP_WORDS[$COMP_CWORD]}"))
+    COMPREPLY=($(compgen -W "network-scanning sensor-node help" "${COMP_WORDS[$COMP_CWORD]}"))
   fi
 }
 
diff --git a/build.sh b/build.sh
index 0d74109..ead1694 100755
--- a/build.sh
+++ b/build.sh
@@ -66,6 +66,13 @@ do
             COMMAND_CREATE=1
             ;;
 
+        sensor-node)
+	    DESC="Sensor node" ;
+	    build="build-sensor-mote.sh" ;
+            docdir="sensor-node" ;
+            COMMAND_CREATE=1
+            ;;
+
         *)
             echo "ERROR: unknown parameter \"$PARAM\""
             usage