diff --git a/build.gradle b/build.gradle
index a9d292cd4..c2a93cc04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -214,7 +214,7 @@ def deb(def platform, def arch, def moreDeps = '') {
         ant.fileset(dir: "ext/deb-bundle")
     }
     ant.copy(file: "build/libs/${project.name}-${platform}-${version}.jar", todir: "${dist}/usr/lib/ipscan")
-    ant.copy(file: "resources/images/icon128.png", tofile: "${dist}/usr/share/pixmaps/ipscan.png")
+    ant.copy(file: "resources/images/icon128.png", tofile: "${dist}/usr/share/pixmaps/net.azlib.ipscan.png")
 
     ant.replace(file: "${dist}/DEBIAN/control") {
         ant.replacefilter(token: "VERSION", value: version)
diff --git a/ext/deb-bundle/usr/share/applications/ipscan.desktop b/ext/deb-bundle/usr/share/applications/net.azlib.ipscan.desktop
similarity index 79%
rename from ext/deb-bundle/usr/share/applications/ipscan.desktop
rename to ext/deb-bundle/usr/share/applications/net.azlib.ipscan.desktop
index e3531e136..14e059410 100644
--- a/ext/deb-bundle/usr/share/applications/ipscan.desktop
+++ b/ext/deb-bundle/usr/share/applications/net.azlib.ipscan.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Angry IP Scanner
 Comment=Fast and friendly network scanner
 GenericName=Fast and friendly network scanner
@@ -7,7 +6,7 @@ Keywords=angry;ipscan;ip;scan;scanner
 Exec=sh /usr/bin/ipscan
 Terminal=false
 Type=Application
-Icon=ipscan
-Categories=Application;Network;Internet;
+Icon=net.azlib.ipscan
+Categories=Application;Network;
 StartupWMClass=Angry IP Scanner
 StartupNotify=true
diff --git a/ext/deb-bundle/usr/share/metainfo/ipscan.appdata.xml b/ext/deb-bundle/usr/share/metainfo/net.azlib.ipscan.metainfo.xml
similarity index 82%
rename from ext/deb-bundle/usr/share/metainfo/ipscan.appdata.xml
rename to ext/deb-bundle/usr/share/metainfo/net.azlib.ipscan.metainfo.xml
index 17d56fdbc..dc29c2e3f 100644
--- a/ext/deb-bundle/usr/share/metainfo/ipscan.appdata.xml
+++ b/ext/deb-bundle/usr/share/metainfo/net.azlib.ipscan.metainfo.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>ipscan.desktop</id>
+    <id>net.azlib.ipscan.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0+</project_license>
     <name>Angry IP Scanner</name>
     <summary>Fast and friendly network scanner</summary>
     <icon type="remote" width="128" height="128">https://angryip.org/images/icon.png</icon>
-    <launchable type="desktop-id">ipscan.desktop</launchable>
+    <launchable type="desktop-id">net.azlib.ipscan.desktop</launchable>
+    <developer id="org.angryip">
+        <name>Anton Keks and contributors</name>
+    </developer>
     <description>
-        <p>Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner designed to be fast and simple to use. It scans IP addresses and ports as well as has many other features.</p
+        <p>Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner designed to be fast and simple to use. It scans IP addresses and ports as well as has many other features.</p>
         <p>It is widely used by network administrators and just curious users around the world, including large and small enterprises, banks, and government agencies.</p>
     </description>
     <categories>
         <category>Network</category>
-        <category>Internet</category>
     </categories>
     <url type="homepage">https://angryip.org/</url>
     <url type="bugtracker">https://github.com/angryip/ipscan/issues</url>
@@ -24,4 +26,5 @@
             <caption>Scan was performed</caption>
         </screenshot>
     </screenshots>
+    <content_rating type="oars-1.1" />
 </component>