diff --git a/scripts/image b/scripts/image
index a7ef5f7c27..d4032d3d57 100755
--- a/scripts/image
+++ b/scripts/image
@@ -86,15 +86,15 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
   fi
   
 # create /etc/os-release
-  echo -e "NAME=$DISTRONAME" > $INSTALL/etc/os-release
-  echo -e "VERSION=$OPENELEC_VERSION" >> $INSTALL/etc/os-release
-  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
-  echo -e "HOME_URL=http://www.openelec.tv" >> $INSTALL/etc/os-release
-  echo -e "BUG_REPORT_URL=https://github.com/OpenELEC/OpenELEC.tv" >> $INSTALL/etc/os-release
+  echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
+  echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
+  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
+  echo -e "HOME_URL=\"http://www.openelec.tv\"" >> $INSTALL/etc/os-release
+  echo -e "BUG_REPORT_URL=\"https://github.com/OpenELEC/OpenELEC.tv\"" >> $INSTALL/etc/os-release
   if [ -n "$GIT_HASH" ]; then
-	echo -e "BUILD_ID=$GIT_HASH" >> $INSTALL/etc/os-release
+	echo -e "BUILD_ID=\"$GIT_HASH\"" >> $INSTALL/etc/os-release
   fi