diff --git a/cc.arduino.arduinoide.json b/cc.arduino.arduinoide.json
index 33b4c2d..bc8823e 100644
--- a/cc.arduino.arduinoide.json
+++ b/cc.arduino.arduinoide.json
@@ -36,6 +36,41 @@
                 "/usr/lib/sdk/openjdk11/install.sh"
             ]
         },
+        {
+            "name": "libusb",
+            "config-opts": [ "--disable-static", "--disable-udev" ],
+            "cleanup": [
+                "/lib/*.la",
+                "/lib/pkgconfig",
+                "/include"
+            ],
+            "sources": [
+                {
+                    "type":"archive",
+                    "url":"https://github.com/libusb/libusb/archive/v1.0.23.tar.gz",
+                    "sha256": "02620708c4eea7e736240a623b0b156650c39bfa93a14bcfa5f3e05270313eba"
+                }
+            ],
+            "post-install": [
+                "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+            ]
+        },
+        {
+            "name": "usbutils",
+            "config-opts": [
+                "--datadir=/app/share/hwdata",
+                "--sbindir=/app/bin"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/gregkh/usbutils.git",
+                    "tag": "v012",
+                    "commit": "f3a05e2e368cf17f9882c8d358f2fa205eb1ead6"
+                }
+
+            ]
+        },
         {
             "name": "arduino",
             "buildsystem": "simple",
@@ -54,9 +89,11 @@
                 "mv /app/Arduino/jre /app/Arduino/java",
                 "mkdir -p /app/share/icons/hicolor",
                 "cp -a /app/Arduino/lib/icons/* /app/share/icons/hicolor",
-                "install -D /app/Arduino/lib/desktop.template /app/share/applications/cc.arduino.arduinoide.desktop",
-                "sed -i -e 's|<BINARY_LOCATION>|arduino|' -e 's|<ICON_NAME>|cc.arduino.arduinoide|' /app/share/applications/cc.arduino.arduinoide.desktop",
-                "install -D /app/Arduino/lib/appdata.xml /app/share/metainfo/cc.arduino.arduinoide.appdata.xml"
+                "install -Dp -m 0644 /app/Arduino/lib/desktop.template /app/share/applications/cc.arduino.arduinoide.desktop",
+                "desktop-file-edit --set-key=\"Exec\" --set-value=\"arduino %F\" /app/share/applications/${FLATPAK_ID}.desktop",
+                "desktop-file-edit --set-icon=\"cc.arduino.arduinoide\" /app/share/applications/cc.arduino.arduinoide.desktop",
+                "install -Dp -m 0644 /app/Arduino/lib/appdata.xml /app/share/metainfo/cc.arduino.arduinoide.appdata.xml",
+                "install -Dp -m 0644 /app/Arduino/lib/arduino-arduinoide.xml /app/share/mime/packages/cc.arduino.arduinoide.xml"
             ],
             "subdir": "build",
             "sources": [