diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 7ffa1be5..56e87f17 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -176,7 +176,7 @@ static GOptionEntry empty_entries[] = {
 };
 
 GOptionEntry user_entries[] = {
-  { "user", 0, 0, G_OPTION_ARG_NONE, &opt_user, N_("Work on the user installation"), NULL },
+  { "user", 'u', 0, G_OPTION_ARG_NONE, &opt_user, N_("Work on the user installation"), NULL },
   { "system", 0, 0, G_OPTION_ARG_NONE, &opt_system, N_("Work on the system-wide installation (default)"), NULL },
   { "installation", 0, 0, G_OPTION_ARG_STRING_ARRAY, &opt_installations, N_("Work on a non-default system-wide installation"), N_("NAME") },
   { NULL }
diff --git a/doc/flatpak-config.xml b/doc/flatpak-config.xml
index c64339de..51d6ea1e 100644
--- a/doc/flatpak-config.xml
+++ b/doc/flatpak-config.xml
@@ -135,6 +135,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-create-usb.xml b/doc/flatpak-create-usb.xml
index f687f4dd..bffb7342 100644
--- a/doc/flatpak-create-usb.xml
+++ b/doc/flatpak-create-usb.xml
@@ -110,6 +110,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-history.xml b/doc/flatpak-history.xml
index 62a56bf6..1c23e164 100644
--- a/doc/flatpak-history.xml
+++ b/doc/flatpak-history.xml
@@ -70,6 +70,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-info.xml b/doc/flatpak-info.xml
index a4448f4d..3383c28a 100644
--- a/doc/flatpak-info.xml
+++ b/doc/flatpak-info.xml
@@ -73,6 +73,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-install.xml b/doc/flatpak-install.xml
index 09011599..51c3d100 100644
--- a/doc/flatpak-install.xml
+++ b/doc/flatpak-install.xml
@@ -148,6 +148,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-list.xml b/doc/flatpak-list.xml
index 91fdff5c..edb9ed4b 100644
--- a/doc/flatpak-list.xml
+++ b/doc/flatpak-list.xml
@@ -74,6 +74,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-make-current.xml b/doc/flatpak-make-current.xml
index 4e7da211..7158840a 100644
--- a/doc/flatpak-make-current.xml
+++ b/doc/flatpak-make-current.xml
@@ -72,6 +72,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-mask.xml b/doc/flatpak-mask.xml
index ec904af3..60624729 100644
--- a/doc/flatpak-mask.xml
+++ b/doc/flatpak-mask.xml
@@ -84,6 +84,7 @@ org.some.App/arm
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-override.xml b/doc/flatpak-override.xml
index 88ec4b1c..8a2e2ee5 100644
--- a/doc/flatpak-override.xml
+++ b/doc/flatpak-override.xml
@@ -78,6 +78,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-pin.xml b/doc/flatpak-pin.xml
index 04e5312a..dad64911 100644
--- a/doc/flatpak-pin.xml
+++ b/doc/flatpak-pin.xml
@@ -89,6 +89,7 @@ org.some.Runtime/arm
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remote-add.xml b/doc/flatpak-remote-add.xml
index b081b753..8f4579f6 100644
--- a/doc/flatpak-remote-add.xml
+++ b/doc/flatpak-remote-add.xml
@@ -81,6 +81,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remote-delete.xml b/doc/flatpak-remote-delete.xml
index fd7337a2..9affd5cf 100644
--- a/doc/flatpak-remote-delete.xml
+++ b/doc/flatpak-remote-delete.xml
@@ -68,6 +68,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remote-info.xml b/doc/flatpak-remote-info.xml
index 971efb83..394bacad 100644
--- a/doc/flatpak-remote-info.xml
+++ b/doc/flatpak-remote-info.xml
@@ -75,6 +75,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remote-ls.xml b/doc/flatpak-remote-ls.xml
index 5178c9d4..0bb32f1a 100644
--- a/doc/flatpak-remote-ls.xml
+++ b/doc/flatpak-remote-ls.xml
@@ -74,6 +74,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remote-modify.xml b/doc/flatpak-remote-modify.xml
index 3529dbfa..2edb5d13 100644
--- a/doc/flatpak-remote-modify.xml
+++ b/doc/flatpak-remote-modify.xml
@@ -68,6 +68,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-remotes.xml b/doc/flatpak-remotes.xml
index 583d4f1c..e2d13de8 100644
--- a/doc/flatpak-remotes.xml
+++ b/doc/flatpak-remotes.xml
@@ -65,6 +65,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-repair.xml b/doc/flatpak-repair.xml
index a2c4d31d..97b9688d 100644
--- a/doc/flatpak-repair.xml
+++ b/doc/flatpak-repair.xml
@@ -84,6 +84,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-run.xml b/doc/flatpak-run.xml
index d5360371..56582ebf 100644
--- a/doc/flatpak-run.xml
+++ b/doc/flatpak-run.xml
@@ -162,6 +162,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-search.xml b/doc/flatpak-search.xml
index 6d111c28..389d37de 100644
--- a/doc/flatpak-search.xml
+++ b/doc/flatpak-search.xml
@@ -53,6 +53,7 @@
 
         <variablelist>
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-uninstall.xml b/doc/flatpak-uninstall.xml
index 3930e01d..cc29c049 100644
--- a/doc/flatpak-uninstall.xml
+++ b/doc/flatpak-uninstall.xml
@@ -106,6 +106,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>
diff --git a/doc/flatpak-update.xml b/doc/flatpak-update.xml
index f8c4c19d..feaaf278 100644
--- a/doc/flatpak-update.xml
+++ b/doc/flatpak-update.xml
@@ -111,6 +111,7 @@
             </varlistentry>
 
             <varlistentry>
+                <term><option>-u</option></term>
                 <term><option>--user</option></term>
 
                 <listitem><para>