diff --git a/doc/Makefile b/doc/Makefile
index 67aafb2fd..ea9bd5b76 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -91,6 +91,6 @@ doc-clean:
 	$(RM) doc/deployable-lightning.{aux,bbl,blg,dvi,log,out,tex}
 
 doc/index.rst:
-	(grep -v '^   lightning.*\.[0-9]\.md$$' $@; for m in $$(cd doc && ls lightning*.[0-9].md); do echo "   $$m"; done) > $@.tmp.$$$$ && mv $@.tmp.$$$$ $@
+	(grep -v '^   lightning-.*\.[0-9]\.md>$$' $@; for m in $$(cd doc && ls lightning*.[0-9].md | sort); do echo "   $$(echo $$m | sed 's/.[0-9].md//') <$$m>"; done) > $@.tmp.$$$$ && mv $@.tmp.$$$$ $@
 
 .PHONY: doc/index.rst
diff --git a/doc/index.rst b/doc/index.rst
index 3cab8583f..db17697c6 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -27,39 +27,39 @@ c-lightning Documentation
    :maxdepth: 1
    :caption: Manpages
 
-   lightning-autocleaninvoice.7.md
-   lightning-check.7.md
-   lightning-cli.1.md
-   lightning-close.7.md
-   lightning-connect.7.md
-   lightningd.8.md
-   lightningd-config.5.md
-   lightning-decodepay.7.md
-   lightning-delexpiredinvoice.7.md
-   lightning-delinvoice.7.md
-   lightning-disconnect.7.md
-   lightning-fundchannel.7.md
-   lightning-fundchannel_cancel.7.md
-   lightning-fundchannel_complete.7.md
-   lightning-fundchannel_start.7.md
-   lightning-getroute.7.md
-   lightning-invoice.7.md
-   lightning-listchannels.7.md
-   lightning-listforwards.7.md
-   lightning-listfunds.7.md
-   lightning-listinvoices.7.md
-   lightning-listpays.7.md
-   lightning-listpeers.7.md
-   lightning-listsendpays.7.md
-   lightning-newaddr.7.md
-   lightning-pay.7.md
-   lightning-plugin.7.md
-   lightning-sendpay.7.md
-   lightning-setchannelfee.7.md
-   lightning-txdiscard.7.md
-   lightning-txprepare.7.md
-   lightning-txsend.7.md
-   lightning-waitanyinvoice.7.md
-   lightning-waitinvoice.7.md
-   lightning-waitsendpay.7.md
-   lightning-withdraw.7.md
+   lightning-autocleaninvoice <lightning-autocleaninvoice.7.md>
+   lightning-check <lightning-check.7.md>
+   lightning-cli <lightning-cli.1.md>
+   lightning-close <lightning-close.7.md>
+   lightning-connect <lightning-connect.7.md>
+   lightningd <lightningd.8.md>
+   lightningd-config <lightningd-config.5.md>
+   lightning-decodepay <lightning-decodepay.7.md>
+   lightning-delexpiredinvoice <lightning-delexpiredinvoice.7.md>
+   lightning-delinvoice <lightning-delinvoice.7.md>
+   lightning-disconnect <lightning-disconnect.7.md>
+   lightning-fundchannel <lightning-fundchannel.7.md>
+   lightning-fundchannel_cancel <lightning-fundchannel_cancel.7.md>
+   lightning-fundchannel_complete <lightning-fundchannel_complete.7.md>
+   lightning-fundchannel_start <lightning-fundchannel_start.7.md>
+   lightning-getroute <lightning-getroute.7.md>
+   lightning-invoice <lightning-invoice.7.md>
+   lightning-listchannels <lightning-listchannels.7.md>
+   lightning-listforwards <lightning-listforwards.7.md>
+   lightning-listfunds <lightning-listfunds.7.md>
+   lightning-listinvoices <lightning-listinvoices.7.md>
+   lightning-listpays <lightning-listpays.7.md>
+   lightning-listpeers <lightning-listpeers.7.md>
+   lightning-listsendpays <lightning-listsendpays.7.md>
+   lightning-newaddr <lightning-newaddr.7.md>
+   lightning-pay <lightning-pay.7.md>
+   lightning-plugin <lightning-plugin.7.md>
+   lightning-sendpay <lightning-sendpay.7.md>
+   lightning-setchannelfee <lightning-setchannelfee.7.md>
+   lightning-txdiscard <lightning-txdiscard.7.md>
+   lightning-txprepare <lightning-txprepare.7.md>
+   lightning-txsend <lightning-txsend.7.md>
+   lightning-waitanyinvoice <lightning-waitanyinvoice.7.md>
+   lightning-waitinvoice <lightning-waitinvoice.7.md>
+   lightning-waitsendpay <lightning-waitsendpay.7.md>
+   lightning-withdraw <lightning-withdraw.7.md>