diff --git a/scripts/create_addon b/scripts/create_addon
index 956c4e2cd8..dd36241f0a 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -121,11 +121,7 @@ pack_addon() {
   debug_strip $ADDON_BUILD/$PKG_ADDON_ID
 
   if [ "$2" != "-test" ] ; then
-    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
+    ADDON_INSTALL_DIR="$TARGET/$ADDONS/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH/$PKG_ADDON_ID"
     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
@@ -168,11 +164,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
 
   $SCRIPTS/build $@
 
-  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
+  printf  "%${BUILD_INDENT}c CREATE ADDON  (${DEVICE:-$PROJECT}/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
   export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
   rm -rf $ADDON_BUILD