diff --git a/gui/org.gpsbabel.gui.metainfo.xml b/gui/org.gpsbabel.gui.metainfo.xml
index b19448202..265414783 100644
--- a/gui/org.gpsbabel.gui.metainfo.xml
+++ b/gui/org.gpsbabel.gui.metainfo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- reference: https://freedesktop.org/software/appstream/docs/index.html -->
 <component type="desktop">
   <id>org.gpsbabel.gui</id>
   <metadata_license>MIT</metadata_license>
+  <project_license>GPL-2.0</project_license>
   <name>gpsbabel-gui</name>
   <summary>GPS file conversion plus transfer to/from GPS units</summary>
   <description>
@@ -11,9 +13,14 @@
     <p>This package contains gpsbabelfe, a QT based frontend for
     gpsbabel.</p>
   </description>
-  <url type="homepage">https://www.gpsbabel.org/</url>
+  <url type="homepage">https://www.gpsbabel.org</url>
+  <url type="vcs-browser">https://github.com/GPSBabel/gpsbabel</url>
   <launchable type="desktop-id">gpsbabel.desktop</launchable>
   <provides>
+    <binary>gpsbabelfe</binary>
     <modalias>usb:v091Ep0003d*</modalias>
   </provides>
+  <requires>
+    <id>org.gpsbabel.cli</id>
+  </requires>
 </component>
diff --git a/org.gpsbabel.cli.metainfo.xml b/org.gpsbabel.cli.metainfo.xml
new file mode 100644
index 000000000..f6afb1776
--- /dev/null
+++ b/org.gpsbabel.cli.metainfo.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- reference: https://freedesktop.org/software/appstream/docs/index.html -->
+<component type="console-application">
+  <id>org.gpsbabel.cli</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <name>gpsbabel</name>
+  <summary>GPS file conversion plus transfer to/from GPS units</summary>
+  <description>
+    <p>GPSBabel converts waypoints, tracks, and routes from one common
+    mapping format to another or a serial upload or download to a GPS
+    unit such as those from Garmin.</p>
+
+    <p>GPSBabel supports several data formats and will be useful for
+    tasks such as geocaching, mapping, and converting from one GPS
+    unit to another.  Among the interesting formats it supports are
+    the GPS Exchange Format (GPX), Keyhole Markup Language (KML), several
+    GPS devices via a serial link, and various Geocaching data formats.
+    GPSBabel also supports various filters to manipulate the data.</p>
+
+    <p>GPSBabel supports the following formats:</p>
+
+    <ul>
+      <li>arc: GPSBabel arc filter file</li>
+      <li>csv: Comma separated values</li>
+      <li>cup: See You flight analysis data</li>
+      <li>dg-100: GlobalSat DG-100/BT-335 Download</li>
+      <li>dg-200: GlobalSat DG-200 Download</li>
+      <li>exif: Embedded Exif-GPS data (.jpg)</li>
+      <li>garmin301: Garmin 301 Custom position and heartrate</li>
+      <li>garmin: Garmin serial/USB protocol</li>
+      <li>garmin_fit: Flexible and Interoperable Data Transfer (FIT) Activity file</li>
+      <li>garmin_g1000: Garmin G1000 datalog input filter file</li>
+      <li>garmin_gpi: Garmin Points of Interest (.gpi)</li>
+      <li>garmin_poi: Garmin POI database</li>
+      <li>garmin_txt: Garmin MapSource - txt (tab delimited)</li>
+      <li>garmin_xt: Mobile Garmin XT Track files</li>
+      <li>gdb: Garmin MapSource - gdb</li>
+      <li>geo: Geocaching.com .loc</li>
+      <li>geojson: GeoJson</li>
+      <li>globalsat: GlobalSat GH625XT GPS training watch</li>
+      <li>googletakeout: Google Takeout Location History</li>
+      <li>gpsdrive: GpsDrive Format</li>
+      <li>gpsdrivetrack: GpsDrive Format for Tracks</li>
+      <li>gpx: GPX XML</li>
+      <li>gtm: GPS TrackMaker</li>
+      <li>gtrnctr: Garmin Training Center (.tcx/.crs/.hst/.xml)</li>
+      <li>html: HTML Output</li>
+      <li>humminbird: Humminbird waypoints and routes (.hwr)</li>
+      <li>humminbird_ht: Humminbird tracks (.ht)</li>
+      <li>iblue747: Data Logger iBlue747 csv</li>
+      <li>iblue757: Data Logger iBlue757 csv</li>
+      <li>igc: FAI/IGC Flight Recorder Data Format</li>
+      <li>kml: Google Earth (Keyhole) Markup Language</li>
+      <li>land_air_sea: GPS Tracking Key Pro text</li>
+      <li>lowranceusr: Lowrance USR</li>
+      <li>m241-bin: Holux M-241 (MTK based) Binary File Format</li>
+      <li>m241: Holux M-241 (MTK based) download</li>
+      <li>miniHomer: MiniHomer, a skyTraq Venus 6 based logger (download tracks, waypoints and get/set POI)</li>
+      <li>mtk-bin: MTK Logger (iBlue 747,...) Binary File Format</li>
+      <li>mtk: MTK Logger (iBlue 747,Qstarz BT-1000,...) download</li>
+      <li>nmea: NMEA 0183 sentences</li>
+      <li>openoffice: Tab delimited fields useful for OpenOffice</li>
+      <li>osm: OpenStreetMap data files</li>
+      <li>ozi: OziExplorer</li>
+      <li>qstarz_bl-1000: Qstarz BL-1000</li>
+      <li>shape: ESRI shapefile</li>
+      <li>skytraq-bin: SkyTraq Venus based loggers Binary File Format</li>
+      <li>skytraq: SkyTraq Venus based loggers (download)</li>
+      <li>subrip: SubRip subtitles for video mapping (.srt)</li>
+      <li>text: Textual Output</li>
+      <li>tpg: National Geographic Topo .tpg (waypoints)</li>
+      <li>tpo2: National Geographic Topo 2.x .tpo</li>
+      <li>tpo3: National Geographic Topo 3.x/4.x .tpo</li>
+      <li>unicsv: Universal csv with field structure in first line</li>
+      <li>v900: Columbus/Visiontac V900 files (.csv)</li>
+      <li>vcard: Vcard Output (for iPod)</li>
+    </ul>
+
+    <p>GPSBabel supports the following filters:</p>
+    <ul>
+      <li>arc: Include Only Points Within Distance of Arc</li>
+      <li>bend: Add points before and after bends in routes</li>
+      <li>discard: Remove unreliable points with high hdop or vdop</li>
+      <li>duplicate: Remove Duplicates</li>
+      <li>height: Manipulate altitudes</li>
+      <li>interpolate: Interpolate between trackpoints</li>
+      <li>nuketypes: Remove all waypoints, tracks, or routes</li>
+      <li>polygon: Include Only Points Inside Polygon</li>
+      <li>position: Remove Points Within Distance</li>
+      <li>radius: Include Only Points Within Radius</li>
+      <li>resample: Resample Track</li>
+      <li>reverse: Reverse stops within routes</li>
+      <li>simplify: Simplify routes</li>
+      <li>sort: Rearrange waypoints, routes and/or tracks by resorting</li>
+      <li>stack: Save and restore waypoint lists</li>
+      <li>swap: Swap latitude and longitude of all loaded points</li>
+      <li>track: Manipulate track lists</li>
+      <li>transform: Transform waypoints into a route, tracks into routes, ...</li>
+      <li>validate: Validate internal data structures</li>
+    </ul>
+  </description>
+  <url type="homepage">https://www.gpsbabel.org</url>
+  <url type="vcs-browser">https://github.com/GPSBabel/gpsbabel</url>
+  <provides>
+    <binary>gpsbabel</binary>
+    <modalias>usb:v091Ep0003d*</modalias>
+  </provides>
+</component>
diff --git a/org.gpsbabel.tool.metainfo.xml b/org.gpsbabel.tool.metainfo.xml
deleted file mode 100644
index 17723e386..000000000
--- a/org.gpsbabel.tool.metainfo.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component>
-  <id>org.gpsbabel.tool</id>
-  <metadata_license>MIT</metadata_license>
-  <name>gpsbabel</name>
-  <summary>GPS file conversion plus transfer to/from GPS units</summary>
-  <description>
-    <p>GPSBabel converts waypoints, tracks, and routes from one common
-    mapping format to another or a serial upload or download to a GPS
-    unit such as those from Garmin.</p>
-
-    <p>GPSBabel supports several data formats and will be useful for
-    tasks such as geocaching, mapping, and converting from one GPS
-    unit to another.  Among the interesting formats it supports are
-    several GPS devices via a serial link, various PDA-based mapping
-    programs, and various Geocaching data formats.</p>
-
-    <p>Among others GPSBabel supports the following formats:</p>
-
-    <p>All database fields on one tab-separated line,
-    Columbus/Visiontac V900 files (.csv), Comma separated values,
-    Custom "Everything" Style, Data Logger iBlue747 csv, Data Logger
-    iBlue757 csv, Embedded Exif-GPS data (.jpg), ESRI shapefile,
-    FAI/IGC Flight Recorder Data Format, Flexible and Interoperable
-    Data Transfer (FIT) Activity file, Garmin 301 Custom position and
-    heartrate, Garmin G1000 datalog input filter file, Garmin
-    MapSource - gdb, Garmin MapSource - txt (tab delimited), Garmin
-    POI database, Garmin Points of Interest (.gpi), Garmin serial/USB
-    protocol, Garmin Training Center (.tcx/.crs/.hst/.xml),
-    Geocaching.com .loc, GeoJson, GlobalSat DG-100/BT-335 Binary File,
-    GlobalSat DG-100/BT-335 Download, GlobalSat DG-200 Binary File,
-    GlobalSat DG-200 Download, GlobalSat GH625XT GPS training watch,
-    Google Earth (Keyhole) Markup Language, Google Takeout Location
-    History, GPS Tracking Key Pro text, GPS TrackMaker, GPSBabel arc
-    filter file, GpsDrive Format, GpsDrive Format for Tracks, GPX XML,
-    Holux M-241 (MTK based) Binary File Format, Holux M-241 (MTK
-    based) download, HTML Output, Humminbird tracks (.ht), Humminbird
-    waypoints and routes (.hwr), Internal GPS data generator, Lowrance
-    USR, MiniHomer, a skyTraq Venus 6 based logger (download tracks,
-    waypoints and get/set POI) Mobile Garmin XT Track files, MTK
-    Logger (iBlue 747,...) Binary File Format, MTK Logger (iBlue
-    747,Qstarz BT-1000,...) download, National Geographic Topo .tpg
-    (waypoints), National Geographic Topo 2.x .tpo, National
-    Geographic Topo 3.x/4.x .tpo, NMEA 0183 sentences, OpenStreetMap
-    data files, OziExplorer, Qstarz BL-1000, See You flight analysis
-    data, SkyTraq Venus based loggers (download), SkyTraq Venus based
-    loggers Binary File Format, SubRip subtitles for video mapping
-    (.srt), Tab delimited fields useful for OpenOffice, Textual
-    Output, Universal csv with field structure in first line and Vcard
-    Output (for iPod)
-    </p>
-  </description>
-  <url type="homepage">https://www.gpsbabel.org/</url>
-  <provides>
-    <modalias>usb:v091Ep0003d*</modalias>
-  </provides>
-</component>