diff --git a/scripts/create_addon b/scripts/create_addon
index 23270a1f92..fc38dafddf 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -119,7 +119,11 @@ pack_addon() {
        -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
 
   if [ "$2" != "-test" ] ; then
-    ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
+    if [ -n "${DEVICE}" ]; then
+      ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$DEVICE/$TARGET_ARCH/$PKG_ADDON_ID"
+    else
+      ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID"
+    fi
     if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ] ; then
       echo "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***"
       return 0
@@ -162,7 +166,11 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
 
   $SCRIPTS/build $@
 
-  printf  "%${BUILD_INDENT}c CREATE ADDON  ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
+  if [ -n "${DEVICE}" ]; then
+    printf  "%${BUILD_INDENT}c CREATE ADDON  ($DEVICE/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
+  else
+    printf  "%${BUILD_INDENT}c CREATE ADDON  ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
+  fi
   export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
   rm -rf $ADDON_BUILD