diff --git a/org.codelite.CodeLite/appdata.xml b/org.codelite.CodeLite/appdata.xml
new file mode 100644
index 0000000..bb60893
--- /dev/null
+++ b/org.codelite.CodeLite/appdata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+	<id>org.codelite.CodeLite</id>
+	<metadata_license>GPL-2.0</metadata_license>
+	<project_license>GPL-2.0</project_license>
+	<name>CodeLite</name>
+	<launchable type="desktop-id">org.codelite.CodeLite.desktop</launchable>
+	<categories>
+		<category>Development</category>
+	</categories>
+	<summary></summary>
+	<description></description>
+</component>
diff --git a/org.codelite.CodeLite/org.codelite.CodeLite.yaml b/org.codelite.CodeLite/org.codelite.CodeLite.yaml
index 7eb237c..32a1147 100644
--- a/org.codelite.CodeLite/org.codelite.CodeLite.yaml
+++ b/org.codelite.CodeLite/org.codelite.CodeLite.yaml
@@ -3,6 +3,7 @@ runtime: org.gnome.Platform
 runtime-version: 3.28
 sdk: org.gnome.Sdk
 branch: 12.0
+separate-locales: false
 
 modules:
     -   name: wx
@@ -35,10 +36,22 @@ modules:
         buildsystem: simple
         build-commands:
             - cp -v /usr/lib/libclang* /app/lib
+    -   name: fix-appdata
+        sources:
+            -   type: file
+                path: appdata.xml
+                dest-filename: appdata.xml
+        buildsystem: simple
+        build-commands:
+            - mkdir -p /app/share/metainfo
+            - cp -v appdata.xml /app/share/metainfo/org.codelite.CodeLite.appdata.xml
+            - mv -v /app/share/applications/codelite.desktop /app/share/applications/org.codelite.CodeLite.desktop
+            - perl -pi -e s/Icon\\=codelite/Icon\\=org\\.codelite\\.CodeLite/g /app/share/applications/org.codelite.CodeLite.desktop
+            - bash -c "for x in /app/share/icons/hicolor/*/apps/codelite.png; do mv -v \$x \${x%codelite.png}org.codelite.CodeLite.png; done"
 
 command: codelite
 finish-args:
-    - --filesystem=host
+    - --filesystem=home
     - --share=ipc
     - --share=network
     - --socket=x11