diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 56e5c358..2cfc4251 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -78,10 +78,11 @@ static FlatpakCommand commands[] = {
 
    /* translators: please keep the leading newline and space */
   { N_("\n Manage remote repositories") },
+  { "remotes", N_("List all configured remotes"), flatpak_builtin_list_remotes, flatpak_complete_list_remotes },
   { "remote-add", N_("Add a new remote repository (by URL)"), flatpak_builtin_add_remote, flatpak_complete_add_remote },
   { "remote-modify", N_("Modify properties of a configured remote"), flatpak_builtin_modify_remote, flatpak_complete_modify_remote },
   { "remote-delete", N_("Delete a configured remote"), flatpak_builtin_delete_remote, flatpak_complete_delete_remote },
-  { "remote-list", N_("List all configured remotes"), flatpak_builtin_list_remotes, flatpak_complete_list_remotes },
+  { "remote-list", NULL, flatpak_builtin_list_remotes, flatpak_complete_list_remotes, TRUE },
   { "remote-ls", N_("List contents of a configured remote"), flatpak_builtin_ls_remote, flatpak_complete_ls_remote },
 
    /* translators: please keep the leading newline and space */
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c5bf4781..917efd93 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,9 +19,9 @@ XSLTPROC_FLAGS = \
 
 man1 = \
 	flatpak.1			\
+	flatpak-remotes.1		\
 	flatpak-remote-add.1		\
 	flatpak-remote-delete.1		\
-	flatpak-remote-list.1		\
 	flatpak-remote-modify.1		\
 	flatpak-remote-ls.1		\
 	flatpak-install.1		\
diff --git a/doc/flatpak-docs.xml.in b/doc/flatpak-docs.xml.in
index 91dbde36..88761cf7 100644
--- a/doc/flatpak-docs.xml.in
+++ b/doc/flatpak-docs.xml.in
@@ -25,10 +25,10 @@
     <xi:include href="@srcdir@/flatpak-document-unexport.xml"/>
     <xi:include href="@srcdir@/flatpak-document-info.xml"/>
     <xi:include href="@srcdir@/flatpak-document-list.xml"/>
+    <xi:include href="@srcdir@/flatpak-remotes.xml"/>
     <xi:include href="@srcdir@/flatpak-remote-add.xml"/>
     <xi:include href="@srcdir@/flatpak-remote-modify.xml"/>
     <xi:include href="@srcdir@/flatpak-remote-delete.xml"/>
-    <xi:include href="@srcdir@/flatpak-remote-list.xml"/>
     <xi:include href="@srcdir@/flatpak-remote-ls.xml"/>
     <xi:include href="@srcdir@/flatpak-build-init.xml"/>
     <xi:include href="@srcdir@/flatpak-build.xml"/>
diff --git a/doc/flatpak-remote-modify.xml b/doc/flatpak-remote-modify.xml
index 2ceb67f2..7746e343 100644
--- a/doc/flatpak-remote-modify.xml
+++ b/doc/flatpak-remote-modify.xml
@@ -251,7 +251,7 @@
                 <citerefentry><refentrytitle>flatpak</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>flatpak-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                 <citerefentry><refentrytitle>flatpak-remote-delete</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>flatpak-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>flatpak-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry>
             </para>
     </refsect1>
 
diff --git a/doc/flatpak-remote-list.xml b/doc/flatpak-remotes.xml
similarity index 93%
rename from doc/flatpak-remote-list.xml
rename to doc/flatpak-remotes.xml
index 132c4895..75dd6ca6 100644
--- a/doc/flatpak-remote-list.xml
+++ b/doc/flatpak-remotes.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
-<refentry id="flatpak-remote-list">
+<refentry id="flatpak-remotes">
 
     <refentryinfo>
-        <title>flatpak remote-list</title>
+        <title>flatpak remotes</title>
         <productname>flatpak</productname>
 
         <authorgroup>
@@ -19,18 +19,18 @@
     </refentryinfo>
 
     <refmeta>
-        <refentrytitle>flatpak remote-list</refentrytitle>
+        <refentrytitle>flatpak remotes</refentrytitle>
         <manvolnum>1</manvolnum>
     </refmeta>
 
     <refnamediv>
-        <refname>flatpak-remote-list</refname>
+        <refname>flatpak-remotes</refname>
         <refpurpose>List remote repositories</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>flatpak remote-list</command>
+                <command>flatpak remotes</command>
                 <arg choice="opt" rep="repeat">OPTION</arg>
             </cmdsynopsis>
     </refsynopsisdiv>
@@ -138,7 +138,7 @@
         <title>Examples</title>
 
         <para>
-            <command>$ flatpak remote-list --user --show-details</command>
+            <command>$ flatpak remotes --user --show-details</command>
         </para>
 <programlisting>
 testrepo	Test Repository	 http://209.132.179.91/repo/ no-gpg-verify
diff --git a/doc/flatpak.xml b/doc/flatpak.xml
index d94c1ad9..09199547 100644
--- a/doc/flatpak.xml
+++ b/doc/flatpak.xml
@@ -248,6 +248,13 @@
         <para>Commands for managing remote repositories:</para>
 
         <variablelist>
+            <varlistentry>
+                <term><citerefentry><refentrytitle>flatpak-remotes</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
+
+                <listitem><para>
+                    List all configured remote repositories.
+                </para></listitem>
+            </varlistentry>
             <varlistentry>
                 <term><citerefentry><refentrytitle>flatpak-remote-add</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
 
@@ -269,13 +276,6 @@
                     Delete a configured remote repository.
                 </para></listitem>
             </varlistentry>
-            <varlistentry>
-                <term><citerefentry><refentrytitle>flatpak-remote-list</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>
-
-                <listitem><para>
-                    List all configured remote repositories.
-                </para></listitem>
-            </varlistentry>
             <varlistentry>
                 <term><citerefentry><refentrytitle>flatpak-remote-ls</refentrytitle><manvolnum>1</manvolnum></citerefentry></term>