diff --git a/scripts/image b/scripts/image
index 44eb24c77f..920fa5ab19 100755
--- a/scripts/image
+++ b/scripts/image
@@ -88,12 +88,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # create /etc/os-release
   echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
   echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
-  echo -e "ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
-  if [ "$OFFICIAL" = "yes" ]; then
-    echo -e "BUILD=\"official\"" >> $INSTALL/etc/os-release
-  else
-    echo -e "BUILD=\"unofficial\"" >> $INSTALL/etc/os-release
-  fi
   echo -e "ID=\"openelec\"" >> $INSTALL/etc/os-release
   echo -e "VERSION_ID=\"$OS_VERSION\"" >> $INSTALL/etc/os-release
   echo -e "PRETTY_NAME=\"$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) - Version: $OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
@@ -102,7 +96,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   if [ -n "$GIT_HASH" ]; then
 	echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
   fi
-  
+  echo -e "OPENELEC_ARCH=\"$PROJECT.$TARGET_ARCH\"" >> $INSTALL/etc/os-release
+  if [ "$OFFICIAL" = "yes" ]; then
+    echo -e "OPENELEC_BUILD=\"official\"" >> $INSTALL/etc/os-release
+  else
+    echo -e "OPENELEC_BUILD=\"unofficial\"" >> $INSTALL/etc/os-release
+  fi
 
   if [ "$OFFICIAL" = "yes" ]; then
     echo "official" > $INSTALL/etc/build