diff --git a/Makefile b/Makefile
index 0d5da0e..3e64c85 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ OBJECTS = $(SOURCES:$(srcdir)/%.cpp=$(tmpdir)/%.o)
 DEBUGOBJECTS = $(SOURCES:$(srcdir)/%.cpp=$(debugdir)/%.o)
 TARGET = $(bindir)/$(polishedmap)
 DEBUGTARGET = $(bindir)/$(polishedmapd)
-DESKTOP = "$(DESTDIR)$(PREFIX)/share/applications/Polished Map.desktop"
+DESKTOP = "$(DESTDIR)$(PREFIX)/share/applications/io.github.Rangi42.polished-map.desktop"
 
 .PHONY: all $(polishedmap) $(polishedmapd) release debug clean install uninstall
 
@@ -76,9 +76,15 @@ install: release
 	echo "Exec=$(PREFIX)/bin/$(polishedmap)" >> $(DESKTOP)
 	echo "Type=Application" >> $(DESKTOP)
 	echo "Terminal=false" >> $(DESKTOP)
+	echo "Category=Game;" >> $(DESKTOP)
+	echo "Keywords=Nintendo;PokemonGameBoy;Hack;Mapeditor;" >> $(DESKTOP)
+	install -Dm644 io.github.Rangi42.polished-map.png -t $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps
+	install -Dm644 io.github.Rangi42.polished-map.metainfo.xml -t $(DESTDIR)$(PREFIX)/share/metainfo
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(polishedmap)
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/polishedmap48.xpm
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/polishedmap16.xpm
 	rm -f $(DESKTOP)
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/io.github.Rangi42.polished-map.png
+	$(DESTDIR)$(PREFIX)/share/metainfo/io.github.Rangi42.polished-map.metainfo.xml
diff --git a/io.github.Rangi42.polished-map.metainfo.xml b/io.github.Rangi42.polished-map.metainfo.xml
new file mode 100644
index 0000000..6957679
--- /dev/null
+++ b/io.github.Rangi42.polished-map.metainfo.xml
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='utf-8'?>
+<component type="desktop">
+  <!--Created with jdAppdataEdit 5.1-->
+  <id>io.github.Rangi42.polished-map</id>
+  <name>Polished Map</name>
+  <summary>Edit pokecrystal maps and tilesets</summary>
+  <developer_name>Rangi42</developer_name>
+  <launchable type="desktop-id">io.github.Rangi42.polished-map.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-3.0</project_license>
+  <description>
+    <p>A map and tileset editor for pokecrystal, pokegold, pokeyellow, pokered, and hacks including Polished Crystal v2, Red++ v3, Orange, Prism, and many more.</p>
+    <p>For projects that use 256–512 tiles and per-block attributes, including Polished Crystal v3, Red++ v4, Coral, Black and White 3: Genesis, and Ancient Ruby, use Polished Map++!</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <caption>The Main Window</caption>
+      <image type="source">https://github.com/Rangi42/polished-map/blob/v4.7.1/screenshot.png?raw=true</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="v4.7.1" date="2021-11-01" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.7.1</url>
+      <description>
+        <ul>
+          <li>Alt+1 through Alt+8 set the palette for the current tile in the tileset editor</li>
+          <li>Correct "Show Events" button tooltip (Ctrl+Shift+V)</li>
+          <li>Improve compatibility with international characters in filenames</li>
+        </ul>
+      </description>
+    </release>
+    <release version="v4.7.0" date="2021-08-29" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.7.0</url>
+    </release>
+    <release version="v4.6.0" date="2021-06-02" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.6.0</url>
+    </release>
+    <release version="v4.5.4" date="2020-11-22" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.5.4</url>
+    </release>
+    <release version="v4.5.3" date="2020-11-13" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.5.3</url>
+    </release>
+    <release version="v4.5.2" date="2020-08-24" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.5.2</url>
+    </release>
+    <release version="v4.5.1" date="2020-07-12" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.5.1</url>
+    </release>
+    <release version="v4.5.0" date="2020-03-07" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.5.0</url>
+    </release>
+    <release version="v4.4.4" date="2020-01-23" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.4.4</url>
+    </release>
+    <release version="v4.4.3" date="2019-11-17" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.4.3</url>
+    </release>
+    <release version="v4.4.2" date="2019-10-31" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.4.2</url>
+    </release>
+    <release version="v4.4.1" date="2019-10-19" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.4.1</url>
+    </release>
+    <release version="v4.4.0" date="2019-09-02" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.4.0</url>
+    </release>
+    <release version="v4.3.1" date="2019-07-27" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.3.1</url>
+    </release>
+    <release version="v4.3.0" date="2019-07-17" type="stable">
+      <url>https://github.com/Rangi42/polished-map/releases/tag/v4.3.0</url>
+    </release>
+  </releases>
+  <url type="homepage">https://github.com/Rangi42/polished-map</url>
+  <url type="bugtracker">https://github.com/Rangi42/polished-map/issues</url>
+  <categories>
+    <category>Game</category>
+  </categories>
+  <recommends>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </recommends>
+  <content_rating type="oars-1.1"/>
+  <provides>
+    <binary>polishedmap</binary>
+  </provides>
+  <keywords>
+    <keyword>Nintendo</keyword>
+    <keyword>Pokemon</keyword>
+    <keyword>GameBoy</keyword>
+    <keyword>Hack</keyword>
+    <keyword>Mapeditor</keyword>
+  </keywords>
+</component>
diff --git a/io.github.Rangi42.polished-map.png b/io.github.Rangi42.polished-map.png
new file mode 100644
index 0000000..45de18c
Binary files /dev/null and b/io.github.Rangi42.polished-map.png differ