diff --git a/app/flatpak-builtins-ls-remote.c b/app/flatpak-builtins-ls-remote.c
index 30a3adf2..b303bef9 100644
--- a/app/flatpak-builtins-ls-remote.c
+++ b/app/flatpak-builtins-ls-remote.c
@@ -146,14 +146,25 @@ flatpak_builtin_ls_remote (int argc, char **argv, GCancellable *cancellable, GEr
   keys = (const char **) g_hash_table_get_keys_as_array (names, &n_keys);
   g_qsort_with_data (keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
 
+  FlatpakTablePrinter *printer = flatpak_table_printer_new ();
+
   for (i = 0; i < n_keys; i++)
     {
+      flatpak_table_printer_add_column (printer, keys[i]);
       if (opt_show_details)
-        g_print ("%s %.12s\n", keys[i], (char *) g_hash_table_lookup (names, keys[i]));
-      else
-        g_print ("%s\n", keys[i]);
+        {
+          g_autofree char *value = NULL;
+
+          value = g_strdup ((char *) g_hash_table_lookup (names, keys[i]));
+          value[MIN (strlen (value), 12)] = 0;
+          flatpak_table_printer_add_column (printer, value);
+        }
+      flatpak_table_printer_finish_row (printer);
     }
 
+  flatpak_table_printer_print (printer);
+  flatpak_table_printer_free (printer);
+
   return TRUE;
 }
 
@@ -165,6 +176,7 @@ flatpak_complete_ls_remote (FlatpakCompletion *completion)
   int i;
 
   context = g_option_context_new ("");
+
   if (!flatpak_option_context_parse (context, options, &completion->argc, &completion->argv, 0, &dir, NULL, NULL))
     return FALSE;