diff --git a/Makefile.am b/Makefile.am
index 2bd5634b..8264fa06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,13 +19,13 @@ icon32dir = $(datadir)/icons/hicolor/32x32/apps
 iconscdir = $(datadir)/icons/hicolor/scalable/apps
 desktopdir = $(datadir)/applications
 mimepkgdir = $(datadir)/mime/packages
-appdatadir = $(datadir)/appdata
+appdatadir = $(datadir)/metainfo
 
 dist_icon32_DATA = fityk.png
 dist_iconsc_DATA = fityk.svg
 dist_desktop_DATA = fityk.desktop
 dist_mimepkg_DATA = fityk.xml
-dist_appdata_DATA = fityk.appdata.xml
+dist_appdata_DATA = pl.nieto.fityk.metainfo.xml
 
 # ---  cli/ ---
 cli_cfityk_SOURCES = cli/gnuplot.cpp cli/main.cpp cli/gnuplot.h
diff --git a/fityk.appdata.xml b/pl.nieto.fityk.metainfo.xml
similarity index 69%
rename from fityk.appdata.xml
rename to pl.nieto.fityk.metainfo.xml
index 00592dab..e2d71e87 100644
--- a/fityk.appdata.xml
+++ b/pl.nieto.fityk.metainfo.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2023 Marcin Wojdyr -->
 <component type="desktop-application">
 	<id>pl.nieto.fityk</id>
 	<metadata_license>CC0-1.0</metadata_license>
@@ -7,13 +8,10 @@
 	<summary>Non-linear curve fitting and data analysis</summary>
 
 	<description>
-		<p>Fityk [fi:tik] is a program for data processing and nonlinear curve fitting.</p>
-		<p>Primarily used:</p>
-		<ul>
-			<li>by scientists who analyse data from powder diffraction, chromatography, photoluminescence and photoelectron spectroscopy, infrared and Raman spectroscopy, and other experimental techniques,</li>
-			<li>to fit peaks – bell-shaped functions (Gaussian, Lorentzian, Voigt, Pearson VII, bifurcated Gaussian, EMG, Doniach-Sunjic, etc.),</li>
-		</ul>
-		<p>but it is suitable for fitting any curve to 2D (x,y) data.</p>
+		<p>Fityk [fi:tik] is a program for data processing and nonlinear curve fitting of analytical functions to data (usually experimental data). It is primarily peak fitting software, but can handle other types of functions as well.</p>
+		<p>Apart from the actual fitting, the program helps with data processing and provides an ergonomic graphical interface and also a command line interface and a scripting API.</p>
+		<p>Fityk offers various nonlinear fitting methods (such as Gaussian, Voigt, sigmoid, polynomial and dozens of others), simple background subtraction and other manipulations to the dataset, easy placement of peaks and changing of peak parameters, support for analysis of series of datasets, automation of common tasks with scripts, and much more.</p>
+		<p>Fityk is reportedly used in crystallography, chromatography, photoluminescence and photoelectron spectroscopy, infrared and Raman spectroscopy, to name but a few.</p>
 	</description>
 
 	<categories>
@@ -26,6 +24,12 @@
 
 	<launchable type="desktop-id">fityk.desktop</launchable>
 
+	<keywords>
+		<keyword>curve fitting</keyword>
+		<keyword>XPS</keyword>
+		<keyword>crystallography</keyword>
+	</keywords>
+
 	<screenshots>
 		<screenshot type="default">
 			<caption>Main window with three plots</caption>
@@ -52,7 +56,7 @@
 			<image>https://alexpl.fedorapeople.org/AppData/fityk/screens/Screen05.png</image>
 		</screenshot>
 		<screenshot>
-			<caption>Fitting functions can be edited and custom ones added</caption>
+			<caption>Fitting functions can be created/edited</caption>
 			<image>https://alexpl.fedorapeople.org/AppData/fityk/screens/Screen06.png</image>
 		</screenshot>
 	</screenshots>
@@ -75,7 +79,7 @@
 		</release>
 	</releases>
 
-	<url type="homepage">http://fityk.nieto.pl/</url>
+	<url type="homepage">https://fityk.nieto.pl/</url>
 
 	<provides>
 		<binary>fityk</binary>