diff --git a/app/flatpak-builtins-document-list.c b/app/flatpak-builtins-document-list.c
index 8d8f22f3..439c97c3 100644
--- a/app/flatpak-builtins-document-list.c
+++ b/app/flatpak-builtins-document-list.c
@@ -34,13 +34,27 @@
 #include "flatpak-builtins.h"
 #include "flatpak-utils-private.h"
 #include "flatpak-run-private.h"
+#include "flatpak-table-printer.h"
+
+static const char **opt_cols;
 
 static GOptionEntry options[] = {
+  { "columns", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_cols, N_("What information to show"), N_("FIELD,…")  },
+  { NULL }
+};
+
+static Column all_columns[] = {
+  { "id",          N_("ID"),          N_("Show the document ID"),              1, 1 },
+  { "path",        N_("Path"),        N_("Show the document path"),            1, 0 },
+  { "origin",      N_("Origin"),      N_("Show the document path"),            1, 1 },
+  { "application", N_("Application"), N_("Show applications with permission"), 1, 0 },
+  { "permissions", N_("Permissions"), N_("Show permissions for applications"), 1, 0 },
   { NULL }
 };
 
 static gboolean
 print_documents (const char *app_id,
+                 Column *columns,
                  GCancellable *cancellable,
                  GError **error)
 {
@@ -49,7 +63,11 @@ print_documents (const char *app_id,
   g_autoptr(GVariant) apps = NULL;
   g_autoptr(GVariantIter) iter = NULL;
   const char *id;
-  const char *path;
+  const char *origin;
+  FlatpakTablePrinter *printer;
+  g_autofree char *mountpoint = NULL;
+  gboolean need_perms = FALSE;
+  int i;
 
   session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
   if (session_bus == NULL)
@@ -66,9 +84,73 @@ print_documents (const char *app_id,
   if (!xdp_dbus_documents_call_list_sync (documents, app_id ? app_id : "", &apps, NULL, error))
     return FALSE;
 
+  if (!xdp_dbus_documents_call_get_mount_point_sync (documents, &mountpoint, NULL, error))
+    return FALSE;
+
+  printer = flatpak_table_printer_new ();
+  flatpak_table_printer_set_column_titles (printer, columns);
+  for (i = 0; columns[i].name; i++)
+    {
+      if (strcmp (columns[i].name, "permissions") == 0 ||
+          strcmp (columns[i].name, "application") == 0)
+        {
+          need_perms = TRUE;
+          break;
+        }
+    }
+
   iter = g_variant_iter_new (apps);
-  while (g_variant_iter_next (iter, "{&s^&ay}", &id, &path))
-    g_print ("%s\t%s\n", id, path);
+  while (g_variant_iter_next (iter, "{&s^&ay}", &id, &origin))
+    {
+      g_autoptr(GVariant) apps2 = NULL;
+      g_autoptr(GVariantIter) iter2 = NULL;
+      const char *app_id2 = NULL;
+      const char **perms = NULL;
+      gboolean just_perms = FALSE;
+
+      if (need_perms)
+        {
+          g_autofree char *origin2 = NULL;
+          if (!xdp_dbus_documents_call_info_sync (documents, id, &origin2, &apps2, NULL, error))
+            return FALSE;
+          iter2 = g_variant_iter_new (apps2);
+        }
+
+      while ((iter2 && g_variant_iter_next (iter2, "{&s^a&s}", &app_id2, &perms)) || !just_perms)
+        {
+          for (i = 0; columns[i].name; i++)
+            {
+              if (strcmp (columns[i].name, "application") == 0)
+                flatpak_table_printer_add_column (printer, app_id2);
+              else if (strcmp (columns[i].name, "permissions") == 0)
+                {
+                  g_autofree char *value = NULL;
+                  if (perms)
+                    value = g_strjoinv (" ", (char **)perms);
+                  flatpak_table_printer_add_column (printer, value);
+                }
+              else if (just_perms)
+                flatpak_table_printer_add_column (printer, "");
+              else if (strcmp (columns[i].name, "id") == 0)
+                flatpak_table_printer_add_column (printer, id);
+              else if (strcmp (columns[i].name, "origin") == 0)
+                flatpak_table_printer_add_column (printer, origin);
+              else if (strcmp (columns[i].name, "path") == 0)
+                {
+                  g_autofree char *basename = g_path_get_basename (origin);
+                  g_autofree char *path = g_build_filename (mountpoint, id, basename, NULL);
+                  flatpak_table_printer_add_column (printer, path);
+                }
+            }
+
+          flatpak_table_printer_finish_row (printer);
+
+          just_perms = TRUE;
+        }
+    }
+
+  flatpak_table_printer_print (printer);
+  flatpak_table_printer_free (printer);
 
   return TRUE;
 }
@@ -80,9 +162,13 @@ flatpak_builtin_document_list (int argc, char **argv,
 {
   g_autoptr(GOptionContext) context = NULL;
   const char *app_id = NULL;
+  g_autofree char *col_help = NULL;
+  g_autofree Column *columns = NULL;
 
   context = g_option_context_new (_("[APPID] - List exported files"));
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+  col_help = column_help (all_columns);
+  g_option_context_set_description (context, col_help);
 
   if (!flatpak_option_context_parse (context, options, &argc, &argv,
                                      FLATPAK_BUILTIN_FLAG_NO_DIR,
@@ -95,7 +181,11 @@ flatpak_builtin_document_list (int argc, char **argv,
   if (argc == 2)
     app_id = argv[1];
 
-  return print_documents (app_id, cancellable, error);
+  columns = handle_column_args (all_columns, FALSE, opt_cols, error);
+  if (columns == NULL)
+    return FALSE;
+
+  return print_documents (app_id, columns, cancellable, error);
 }
 
 gboolean