diff --git a/Makefile b/Makefile
index f88ae78f6..eb4d6a6ed 100644
--- a/Makefile
+++ b/Makefile
@@ -205,7 +205,7 @@ MANPAGES := doc/lightning-cli.1 \
 	doc/lightning-invoice.7 \
 	doc/lightning-listinvoice.7 \
 	doc/lightning-sendpay.7 \
-	doc/lightning-waitinvoice.7
+	doc/lightning-waitanyinvoice.7
 
 PROGRAMS := $(TEST_PROGRAMS)
 
diff --git a/doc/lightning-waitinvoice.7 b/doc/lightning-waitanyinvoice.7
similarity index 79%
rename from doc/lightning-waitinvoice.7
rename to doc/lightning-waitanyinvoice.7
index c8f669ba2..b8175a176 100644
--- a/doc/lightning-waitinvoice.7
+++ b/doc/lightning-waitanyinvoice.7
@@ -1,13 +1,13 @@
 '\" t
-.\"     Title: lightning-waitinvoice
+.\"     Title: lightning-waitanyinvoice
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 09/06/2016
+.\"      Date: 01/23/2017
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "LIGHTNING\-WAITINVOI" "7" "09/06/2016" "\ \&" "\ \&"
+.TH "LIGHTNING\-WAITANYIN" "7" "01/23/2017" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -28,13 +28,13 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-lightning-waitinvoice \- Protocol for waiting for payments\&.
+lightning-waitanyinvoice \- Protocol for waiting for payments\&.
 .SH "SYNOPSIS"
 .sp
-\fBwaitinvoice\fR [\fIlastlabel\fR]
+\fBwaitanyinvoice\fR [\fIlastlabel\fR]
 .SH "DESCRIPTION"
 .sp
-The \fBwaitinvoice\fR RPC command waits until an invoice is paid, then returns a single entry as per \fBlistinvoice\fR\&. It will not return for any invoices paid prior to or including \fIlastlabel\fR\&.
+The \fBwaitanyinvoice\fR RPC command waits until an invoice is paid, then returns a single entry as per \fBlistinvoice\fR\&. It will not return for any invoices paid prior to or including \fIlastlabel\fR\&.
 .sp
 This is usually called iteratively: once with no arguments, then repeatedly with the returned \fIlabel\fR entry\&. This ensures that no paid invoice is missed\&.
 .SH "RETURN VALUE"
diff --git a/doc/lightning-waitinvoice.7.txt b/doc/lightning-waitanyinvoice.7.txt
similarity index 76%
rename from doc/lightning-waitinvoice.7.txt
rename to doc/lightning-waitanyinvoice.7.txt
index 29bf3b89d..7819835b3 100644
--- a/doc/lightning-waitinvoice.7.txt
+++ b/doc/lightning-waitanyinvoice.7.txt
@@ -1,18 +1,18 @@
-LIGHTNING-WAITINVOICE(7)
-========================
+LIGHTNING-WAITANYINVOICE(7)
+===========================
 :doctype: manpage
 
 NAME
 ----
-lightning-waitinvoice - Protocol for waiting for payments.
+lightning-waitanyinvoice - Protocol for waiting for payments.
 
 SYNOPSIS
 --------
-*waitinvoice* ['lastlabel']
+*waitanyinvoice* ['lastlabel']
 
 DESCRIPTION
 -----------
-The *waitinvoice* RPC command waits until an invoice is paid, then
+The *waitanyinvoice* RPC command waits until an invoice is paid, then
 returns a single entry as per *listinvoice*.  It will not return for
 any invoices paid prior to or including 'lastlabel'.