diff --git a/gsmartcontrol/TODO b/gsmartcontrol/TODO
index c3ffe2e..375e11c 100644
--- a/gsmartcontrol/TODO
+++ b/gsmartcontrol/TODO
@@ -28,18 +28,11 @@ Bugs / patches:
 
 TODO:
 
-Fix using multiple -d options (e.g. -d scsi) when there are -d options (e.g.
--d sat) in Preferences. This affects the program only before restart.
-
 Don't rely on smartctl return code (2), parse the output instead.
 	This will allow us to show the Info page.
 
-Don't sort drives like this: Pd0,pd1,pd10,pd11,pd2,pd3,pd4,pd5,pd6,pd8,pd9
-
 Update to latest drivedb.
 
-Write and install appdata file - http://people.freedesktop.org/~hughsient/appdata/
-
 Test Areca windows detection by installing CLI, then replacing it with a dummy
 	program that prints something (with enclosures and without).
 
diff --git a/gsmartcontrol/configure.ac b/gsmartcontrol/configure.ac
index cae5472..a23bec5 100644
--- a/gsmartcontrol/configure.ac
+++ b/gsmartcontrol/configure.ac
@@ -529,7 +529,7 @@ AC_SUBST(AUTODIRS)
 # -------------------------------------------------------------------------------------
 
 
-AC_CONFIG_FILES([ data/gsmartcontrol.desktop \
+AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \
 	data/nsis/distribution.txt data/nsis/distribution-nogtk.txt data/nsis/gsmartcontrol.nsi \
 	debian.dist/changelog \
 	src/gsc_winres.rc src/gsmartcontrol.exe.manifest \
diff --git a/gsmartcontrol/data/Makefile.am b/gsmartcontrol/data/Makefile.am
index de23ce6..5fa727f 100644
--- a/gsmartcontrol/data/Makefile.am
+++ b/gsmartcontrol/data/Makefile.am
@@ -40,6 +40,10 @@ appdata_DATA = icon_cddvd.png icon_hdd.png
 desktopdir = $(datadir)/applications
 desktop_DATA = gsmartcontrol.desktop
 
+# Appdata files
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = gsmartcontrol.appdata.xml
+
 
 # Application pixmap (fallback icon for desktop files).
 # Same as 48/gsmartcontrol.png.
diff --git a/gsmartcontrol/data/gsmartcontrol.appdata.xml.in b/gsmartcontrol/data/gsmartcontrol.appdata.xml.in
new file mode 100644
index 0000000..b0e8b88
--- /dev/null
+++ b/gsmartcontrol/data/gsmartcontrol.appdata.xml.in
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 GSmartControl developers -->
+<component type="desktop">
+	<id>gsmartcontrol</id>
+	<metadata_license>CC0-1.0</metadata_license>
+	<project_license>GPL-2.0 and GPL-3.0</project_license>
+	<name>GSmartControl</name>
+	<summary>Hard Disk and SSD Health Inspection</summary>
+	<description>
+		<p>
+			GSmartControl is a graphical user interface for smartctl, which is a tool for
+			querying and controlling SMART (Self-Monitoring, Analysis, and Reporting
+			Technology) data in hard disk and solid-state drives. It allows you to inspect
+			the drive's SMART data to determine its health, as well as run various tests
+			on it.
+		</p>
+	</description>
+	<launchable type="desktop-id">gsmartcontrol.desktop</launchable>
+	<url type="homepage">http://gsmartcontrol.sourceforge.net</url>
+	<screenshots>
+		<screenshot type="default">
+			<caption>Main window</caption>
+			<image>http://gsmartcontrol.sourceforge.net/home/images/main_ok.png</image>
+		</screenshot>
+		<screenshot>
+			<caption>Drive identity information</caption>
+			<image>http://gsmartcontrol.sourceforge.net/home/images/info_identity.png</image>
+		</screenshot>
+		<screenshot>
+			<caption>Attribute list of a failing drive</caption>
+			<image>http://gsmartcontrol.sourceforge.net/home/images/info_failing.png</image>
+		</screenshot>
+	</screenshots>
+</component>
diff --git a/gsmartcontrol/gsmartcontrol.spec.in b/gsmartcontrol/gsmartcontrol.spec.in
index 15247aa..7263d16 100644
--- a/gsmartcontrol/gsmartcontrol.spec.in
+++ b/gsmartcontrol/gsmartcontrol.spec.in
@@ -204,6 +204,7 @@ rm -rf %buildroot
 %{_datadir}/gsmartcontrol
 # %%{_datadir}/gsmartcontrol/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/icons/*
 %{_datadir}/pixmaps/*
 
diff --git a/gsmartcontrol/src/applib/storage_detector.cpp b/gsmartcontrol/src/applib/storage_detector.cpp
index bf032dc..b0d76cb 100644
--- a/gsmartcontrol/src/applib/storage_detector.cpp
+++ b/gsmartcontrol/src/applib/storage_detector.cpp
@@ -86,7 +86,8 @@ std::string StorageDetector::detect(std::vector<StorageDeviceRefPtr>& drives, Ex
 // 		}
 	}
 
-	// Sort the drives, because their order is not quite defined
+	// Sort the drives, because their order is not quite defined.
+	// TODO Sort using natural sort
 	std::sort(drives.begin(), drives.end());
 
 	debug_out_info("app", DBG_FUNC_MSG << "Drive detection finished.\n");
diff --git a/gsmartcontrol/src/applib/storage_detector_other.cpp b/gsmartcontrol/src/applib/storage_detector_other.cpp
index b2e2a14..d1e312c 100644
--- a/gsmartcontrol/src/applib/storage_detector_other.cpp
+++ b/gsmartcontrol/src/applib/storage_detector_other.cpp
@@ -263,6 +263,7 @@ std::string detect_drives_other(std::vector<StorageDeviceRefPtr>& drives, Execut
 
 	#endif
 
+	// TODO Sort using natural sort
 	std::sort(devices.begin(), devices.end());
 
 	for (std::size_t i = 0; i < devices.size(); ++i) {