diff --git a/Makefile b/Makefile
index 9265b1ab2..616de9c68 100644
--- a/Makefile
+++ b/Makefile
@@ -448,6 +448,7 @@ endif
 ifeq ($(HAVE_PYQT),true)
 	# Create directories (gui)
 	install -d $(DESTDIR)$(LIBDIR)/carla/styles
+	install -d $(DESTDIR)$(PREFIX)/share/appdata
 	install -d $(DESTDIR)$(DATADIR)/applications
 	install -d $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps
 	install -d $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps
@@ -504,7 +505,7 @@ endif
 
 	# Install pkg-config files
 	install -m 644 \
-		data/*.pc \
+		data/pkgconfig/*.pc \
 		$(DESTDIR)$(LIBDIR)/pkgconfig
 
 	# Adjust PREFIX, LIBDIR, INCLUDEDIR and VERSION in pkg-config files
@@ -652,6 +653,10 @@ ifeq ($(HAVE_LIBLO),true)
 	install -m 644 data/desktop/carla-control.desktop     $(DESTDIR)$(DATADIR)/applications
 endif
 
+	# Install app data
+	sed -e 's?X-VERSION-X?$(VERSION)?' \
+		data/appdata.xml > $(DESTDIR)$(PREFIX)/share/appdata/studio.kx.carla.appdata.xml
+
 	# Install mime package
 	install -m 644 data/carla.xml $(DESTDIR)$(DATADIR)/mime/packages
 
diff --git a/data/appdata.xml b/data/appdata.xml
index 86c0206e2..91c4bae02 100644
--- a/data/appdata.xml
+++ b/data/appdata.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>studio.kx.carla</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0</project_license>
-  <name>Carla</name>
-  <summary>Audio Plugin Host</summary>
-  <description>
-    <p>Carla is a fully-featured audio plugin host, with support for many audio drivers and plugin formats.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://kx.studio/screenshots/carla.png</image>
-      <image>https://kx.studio/screenshots/carla-patchbay.png</image>
-    </screenshot>
-  </screenshots>
-  <content_rating type="oars-1.1" />
-  <launchable type="desktop-id">studio.kx.carla.desktop</launchable>
-  <url type="homepage">https://kx.studio/Applications:Carla</url>
-  <url type="bugtracker">https://github.com/falkTX/Carla/issues</url>
-  <releases>
-    <release version="2.4.1" date="2021-10-15" />
-  </releases>
-</component>
\ No newline at end of file
+    <id>studio.kx.carla</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0</project_license>
+    <name>Carla</name>
+    <summary>Audio Plugin Host</summary>
+    <description>
+        <p>Carla is a fully-featured audio plugin host, with support for many audio drivers and plugin formats.</p>
+    </description>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://kx.studio/screenshots/carla.png</image>
+            <image>https://kx.studio/screenshots/carla-patchbay.png</image>
+        </screenshot>
+    </screenshots>
+    <content_rating type="oars-1.1" />
+    <launchable type="desktop-id">studio.kx.carla.desktop</launchable>
+    <url type="homepage">https://kx.studio/Applications:Carla</url>
+    <url type="bugtracker">https://github.com/falkTX/Carla/issues</url>
+    <releases>
+        <release version="X-VERSION-X" />
+    </releases>
+</component>
diff --git a/data/carla-host-plugin.pc b/data/pkgconfig/carla-host-plugin.pc
similarity index 100%
rename from data/carla-host-plugin.pc
rename to data/pkgconfig/carla-host-plugin.pc
diff --git a/data/carla-native-plugin.pc b/data/pkgconfig/carla-native-plugin.pc
similarity index 100%
rename from data/carla-native-plugin.pc
rename to data/pkgconfig/carla-native-plugin.pc
diff --git a/data/carla-standalone.pc b/data/pkgconfig/carla-standalone.pc
similarity index 100%
rename from data/carla-standalone.pc
rename to data/pkgconfig/carla-standalone.pc
diff --git a/data/carla-utils.pc b/data/pkgconfig/carla-utils.pc
similarity index 100%
rename from data/carla-utils.pc
rename to data/pkgconfig/carla-utils.pc