diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt
index 662afbd..19d6c76 100644
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@@ -602,8 +602,6 @@ if(BUILD_ENV_APPLE)
     set_target_properties(OpenToonz PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/../cmake/BundleInfo.plist.in)
 endif()
 
-if(BUILD_ENV_UNIXLIKE)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xdg-data/io.github.OpenToonz.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xdg-data/io.github.OpenToonz.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xdg-data/io.github.OpenToonz.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
+if(BUILD_ENV_UNIXLIKE AND NOT BUILD_TARGET_WIN)
+    add_subdirectory(xdg-data)
 endif()
diff --git a/toonz/sources/xdg-data/CMakeLists.txt b/toonz/sources/xdg-data/CMakeLists.txt
new file mode 100644
index 0000000..2ea9786
--- /dev/null
+++ b/toonz/sources/xdg-data/CMakeLists.txt
@@ -0,0 +1,3 @@
+install(FILES io.github.OpenToonz.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+install(FILES io.github.OpenToonz.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+install(FILES io.github.OpenToonz.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
diff --git a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml
index 87567eb..fe60d03 100644
--- a/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml
+++ b/toonz/sources/xdg-data/io.github.OpenToonz.appdata.xml
@@ -19,7 +19,8 @@
       with Digital Video and Studio Ghibli.
     </p>
   </description>
-  <url type="homepage">https://opentoonz.github.io</url>
+  <url type="homepage">https://opentoonz.github.io/e/</url>
+  <url type="bugtracker">https://github.com/opentoonz/opentoonz/issues</url>
   <screenshots>
     <screenshot type="default">
       <image>https://raw.githubusercontent.com/flathub/io.github.OpenToonz/master/screenshot1.png</image>
diff --git a/toonz/sources/xdg-data/io.github.OpenToonz.desktop b/toonz/sources/xdg-data/io.github.OpenToonz.desktop
index 622ab68..dffb54a 100644
--- a/toonz/sources/xdg-data/io.github.OpenToonz.desktop
+++ b/toonz/sources/xdg-data/io.github.OpenToonz.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Type=Application
 Name=OpenToonz
+Comment=2D animation
 Icon=io.github.OpenToonz
 Exec=opentoonz
 Categories=Graphics;
+Terminal=false