diff --git a/doc/lightning-listpays.7 b/doc/lightning-listpays.7
index 4d1eaf8e84a5..c8c0021a22a8 100644
--- a/doc/lightning-listpays.7
+++ b/doc/lightning-listpays.7
@@ -3,12 +3,13 @@
 lightning-listpays - Command for querying payment status
 .SH SYNOPSIS
 
-\fBlistpays\fR [bolt11] [payment_hash]
+\fBlistpays\fR [bolt11] [payment_hash] [status]
 
 .SH DESCRIPTION
 
 The \fBlistpay\fR RPC command gets the status of all \fIpay\fR commands, or a
 single one if either \fIbolt11\fR or \fIpayment_hash\fR was specified\.
+It is possible filter the payments also by status\.
 
 .SH RETURN VALUE
 
@@ -74,4 +75,4 @@ Rusty Russell \fI<rusty@rustcorp.com.au\fR> is mainly responsible\.
 
 Main web site: \fIhttps://github.com/ElementsProject/lightning\fR
 
-\" SHA256STAMP:9b593ed02c10b34ae6f36f91963da0a244df0c3963aaa990e7477008fd3af18d
+\" SHA256STAMP:4cea0f219c2a99fed2db9b95ec4f0210ed4dfa903660849c74238b25d45a637a
diff --git a/doc/lightning-listpays.7.md b/doc/lightning-listpays.7.md
index 788570ba086e..19982dc575fa 100644
--- a/doc/lightning-listpays.7.md
+++ b/doc/lightning-listpays.7.md
@@ -4,13 +4,14 @@ lightning-listpays -- Command for querying payment status
 SYNOPSIS
 --------
 
-**listpays** \[bolt11\] \[payment_hash\]
+**listpays** \[bolt11\] \[payment_hash\] \[status\]
 
 DESCRIPTION
 -----------
 
 The **listpay** RPC command gets the status of all *pay* commands, or a
 single one if either *bolt11* or *payment_hash* was specified.
+It is possible filter the payments also by status.
 
 RETURN VALUE
 ------------
diff --git a/tests/test_pay.py b/tests/test_pay.py
index 7e6426b0168a..c13b85c8a53e 100644
--- a/tests/test_pay.py
+++ b/tests/test_pay.py
@@ -4607,7 +4607,7 @@ def test_listpays_with_filter_by_status(node_factory, bitcoind):
     wait_for(lambda: l2.rpc.listpays(inv['bolt11'])['pays'][0]['status'] == 'complete')
 
     # test if the node is still ready
-    payments = l2.rpc.call("listpays", {"status": 'failed'})
+    payments = l2.rpc.listpays(status='failed')
 
     assert len(payments['pays']) == 0
 
diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
index 7d5baa4d2eda..c9ba9e5918ef 100644
--- a/wallet/db_postgres_sqlgen.c
+++ b/wallet/db_postgres_sqlgen.c
@@ -2038,6 +2038,7 @@ struct db_query db_postgres_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_POSTGRES */
 
+<<<<<<< refs/remotes/ElementsProject/master
 <<<<<<< refs/remotes/ElementsProject/master
 <<<<<<< refs/remotes/ElementsProject/master
 // SHA256STAMP:27a166e040e517422e91cf7ffbd12426b34337b8d75f82d7aa4c448beae5e821
@@ -2056,3 +2057,6 @@ struct db_query db_postgres_queries[] = {
 // SHA256STAMP:2af9ace16d4db060e649c3e078271504fce5a7c5661a25464a551aa7cc7029d0
 >>>>>>> wallet db: Support the query on database with status and payment hash.
 >>>>>>> wallet db: Support the query on database with status and payment hash.
+=======
+// SHA256STAMP:c08699eae7d8de418f7b197aad5682203ebbae633ce8888b9b4797a2db8ce106
+>>>>>>> doc: Update doc with the new parameter supported
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
index 01d69ec8f124..68b98b2a0da8 100644
--- a/wallet/db_sqlite3_sqlgen.c
+++ b/wallet/db_sqlite3_sqlgen.c
@@ -2038,6 +2038,7 @@ struct db_query db_sqlite3_queries[] = {
 
 #endif /* LIGHTNINGD_WALLET_GEN_DB_SQLITE3 */
 
+<<<<<<< refs/remotes/ElementsProject/master
 <<<<<<< refs/remotes/ElementsProject/master
 <<<<<<< refs/remotes/ElementsProject/master
 // SHA256STAMP:27a166e040e517422e91cf7ffbd12426b34337b8d75f82d7aa4c448beae5e821
@@ -2056,3 +2057,6 @@ struct db_query db_sqlite3_queries[] = {
 // SHA256STAMP:2af9ace16d4db060e649c3e078271504fce5a7c5661a25464a551aa7cc7029d0
 >>>>>>> wallet db: Support the query on database with status and payment hash.
 >>>>>>> wallet db: Support the query on database with status and payment hash.
+=======
+// SHA256STAMP:c08699eae7d8de418f7b197aad5682203ebbae633ce8888b9b4797a2db8ce106
+>>>>>>> doc: Update doc with the new parameter supported
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
index 9ba177fb4af2..191a697eb89d 100644
--- a/wallet/statements_gettextgen.po
+++ b/wallet/statements_gettextgen.po
@@ -1347,6 +1347,7 @@ msgid "INSERT INTO channels (id) VALUES (1);"
 msgstr ""
 <<<<<<< refs/remotes/ElementsProject/master
 <<<<<<< refs/remotes/ElementsProject/master
+<<<<<<< refs/remotes/ElementsProject/master
 #  SHA256STAMP:3652b5850f08383c0f0c01a7f11c1a22ec2b4ac16018152d2770a73674fb05ec
 =======
 =======
@@ -1363,3 +1364,6 @@ msgstr ""
 #  SHA256STAMP:697c27016716f435d1ecb4ec3fca117316f779d88c02dbde7ea3214b4bc0a2c7
 >>>>>>> wallet db: Support the query on database with status and payment hash.
 >>>>>>> wallet db: Support the query on database with status and payment hash.
+=======
+#  SHA256STAMP:de612e43f4a76fed487047d802d20cc7185cf5650ed31bc01efb89c495bfbb14
+>>>>>>> doc: Update doc with the new parameter supported