diff --git a/build b/build
index d3292c9..3d02440 100755
--- a/build
+++ b/build
@@ -1,12 +1,18 @@
 #!/bin/bash
 
+set -e
+
 # build packages
 for folder in *; do
     if [ -d $folder ] && [ ${folder:0:1}  != "#" ]; then
-        package="$(cat $folder/DEBIAN/control | grep 'Package: ')"
-        arch="$(cat $folder/DEBIAN/control | grep 'Architecture: ')"
-        version="$(cat $folder/DEBIAN/control | grep 'Version: ')"
-        dpkg  --build $folder "${package#*: }_${version#*: }_${arch#*: }.deb"
-        #echo "${package#*: }_${version#*: }_${arch#*: }.deb"
+        # Get package infos
+        package="$(cat $folder/package/DEBIAN/control | grep 'Package: ')"
+        arch="$(cat $folder/package/DEBIAN/control | grep 'Architecture: ')"
+        version="$(cat $folder/package/DEBIAN/control | grep 'Version: ')"
+        packagename="${package#*: }_${version#*: }_${arch#*: }"
+        # Build Debian package
+        dpkg  --build $folder/package $folder/$packagename.deb
+        # Bundle it with media files for Tooloop app center
+        zip -9 --exclude=*package* $packagename.zip $folder/$packagename.deb $folder/media/*.png $folder/media/*.jpg
     fi
 done
diff --git a/clean b/clean
index 1ffb755..8681cfa 100755
--- a/clean
+++ b/clean
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+for folder in *; do
+    if [ -d $folder ]; then
+        rm -f $folder/*.deb
+        rm -f *.zip
+    fi
+done
+
 rm -fr /assets/packages/*.deb
 rm -fr /assets/packages/Packages*
 rm -fr /assets/packages/Release
diff --git a/update-packages b/update-packages
index 857ca10..9bec6de 100755
--- a/update-packages
+++ b/update-packages
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 # move them to the repository
-mv *.deb /assets/packages
+for folder in *; do
+    if [ -d $folder ] && [ ${folder:0:1}  != "#" ]; then
+        mv $folder/*.deb /assets/packages
+    fi
+done
 
 # update apt
 /opt/tooloop/scripts/tooloop-update-packages