diff --git a/src/_bitcoin-cli b/src/_bitcoin-cli
index 8b61503..8fa441c 100644
--- a/src/_bitcoin-cli
+++ b/src/_bitcoin-cli
@@ -43,18 +43,19 @@ _bitcoin-cli() {
 
   _arguments -C \
     -?'[This help message]' \
-    -conf='[Specify configuration file (default: bitcoin.conf)]:PATH:_files' \
+    -conf='[Specify configuration file. Relative paths will be prefixed by datadir location. (default: bitcoin.conf)]:PATH:_files' \
     -datadir='[Specify data directory]:PATH:_directories' \
+    -getinfo='[Get general information from the remote server.]' \
     -testnet'[Use the test chain]' \
     -regtest'[Enter  regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.]' \
     -named'[Pass named instead of positional arguments (default: false)]' \
-    -stdin'[Read  extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases)]' \
-    -rpcport='[Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)]: :_guard "[[\:digit\:]]#" "PORT"' \
+    -stdin'[Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases)]' \
+    -rpcport='[Connect to JSON-RPC on <port> (default: 8332, testnet: 18332, regtest: 18443)]: :_guard "[[\:digit\:]]#" "PORT"' \
     -rpcwait'[Wait for RPC server to start]' \
     -rpcuser='[Username for JSON-RPC connections]:RPCUSER:()' \
     -rpcpassword='[Password for JSON-RPC connections]:RPCPASSWORD:()' \
     -rpcconnect='[Send commands to node running on <ip> (default: 127.0.0.1)]:RPCCONNECT:_hosts' \
-    -rpcclienttimeout='[Timeout during HTTP requests (default: 900)]: :_guard "[[\:digit\:]]#" "RPCCLIENTTIMEOUT"' \
+    -rpcclienttimeout='[Timeout during HTTP requests, or 0 for no timeout. (default: 900)]: :_guard "[[\:digit\:]]#" "RPCCLIENTTIMEOUT"' \
     ':subcommand:->subcommand' && ret=0
 
   case $state in
@@ -64,9 +65,12 @@ _bitcoin-cli() {
       'getblock'
       'getblockchaininfo'
       'getblockcount'
+      'getblockfilter'
       'getblockhash'
       'getblockheader'
+      'getblockstats'
       'getchaintips'
+      'getchaintxstats'
       'getdifficulty'
       'getmempoolancestors'
       'getmempooldescendants'
@@ -78,19 +82,23 @@ _bitcoin-cli() {
       'gettxoutsetinfo'
       'preciousblock'
       'pruneblockchain'
+      'savemempool'
+      'scantxoutset'
       'verifychain'
       'verifytxoutproof'
-      'getinfo'
       'getmemoryinfo'
+      'getrpcinfo'
       'help'
+      'logging'
       'stop'
-      'generate'
+      'uptime'
       'generatetoaddress'
       'getblocktemplate'
       'getmininginfo'
       'getnetworkhashps'
       'prioritisetransaction'
       'submitblock'
+      'submitheader'
       'addnode'
       'clearbanned'
       'disconnectnode'
@@ -98,41 +106,53 @@ _bitcoin-cli() {
       'getconnectioncount'
       'getnettotals'
       'getnetworkinfo'
+      'getnodeaddresses'
       'getpeerinfo'
       'listbanned'
       'ping'
       'setban'
       'setnetworkactive'
+      'analyzepsbt'
+      'combinepsbt'
+      'combinerawtransaction'
+      'converttopsbt'
+      'createpsbt'
       'createrawtransaction'
+      'decodepsbt'
       'decoderawtransaction'
       'decodescript'
+      'finalizepsbt'
       'fundrawtransaction'
       'getrawtransaction'
+      'joinpsbts'
       'sendrawtransaction'
-      'signrawtransaction'
+      'signrawtransactionwithkey'
+      'testmempoolaccept'
+      'utxoupdatepsbt'
       'createmultisig'
-      'estimatefee'
-      'estimatepriority'
+      'deriveaddresses'
       'estimatesmartfee'
-      'estimatesmartpriority'
+      'getdescriptorinfo'
       'signmessagewithprivkey'
       'validateaddress'
       'verifymessage'
       'abandontransaction'
+      'abortrescan'
       'addmultisigaddress'
-      'addwitnessaddress'
       'backupwallet'
       'bumpfee'
+      'createwallet'
       'dumpprivkey'
       'dumpwallet'
-      'getaccount'
-      'getaccountaddress'
-      'getaddressesbyaccount'
+      'encryptwallet'
+      'getaddressesbylabel'
+      'getaddressinfo'
       'getbalance'
+      'getbalances'
       'getnewaddress'
       'getrawchangeaddress'
-      'getreceivedbyaccount'
       'getreceivedbyaddress'
+      'getreceivedbylabel'
       'gettransaction'
       'getunconfirmedbalance'
       'getwalletinfo'
@@ -143,26 +163,35 @@ _bitcoin-cli() {
       'importpubkey'
       'importwallet'
       'keypoolrefill'
-      'listaccounts'
       'listaddressgroupings'
+      'listlabels'
       'listlockunspent'
-      'listreceivedbyaccount'
       'listreceivedbyaddress'
+      'listreceivedbylabel'
       'listsinceblock'
       'listtransactions'
       'listunspent'
+      'listwalletdir'
+      'listwallets'
+      'loadwallet'
       'lockunspent'
-      'move'
       'removeprunedfunds'
-      'sendfrom'
+      'rescanblockchain'
       'sendmany'
       'sendtoaddress'
-      'setaccount'
+      'sethdseed'
+      'setlabel'
       'settxfee'
+      'setwalletflag'
       'signmessage'
+      'signrawtransactionwithwallet'
+      'unloadwallet'
+      'walletcreatefundedpsbt'
       'walletlock'
       'walletpassphrase'
       'walletpassphrasechange'
+      'walletprocesspsbt'
+      'getzmqnotifications'
     )
 
     _describe -t subcommands 'bitcoin-cli subcommands' subcommands && ret=0