diff --git a/bip-0021.md b/bip-0021.md
index 34a40cd0..fa77e4b5 100644
--- a/bip-0021.md
+++ b/bip-0021.md
@@ -33,12 +33,13 @@ Graphical bitcoin clients SHOULD register themselves as the handler for the "bit
  bitcoinurn     = "bitcoin:" bitcoinaddress [ "?" bitcoinparams ]
  bitcoinaddress = base58 *base58
  bitcoinparams  = *bitcoinparam
- bitcoinparam   = amountparam | labelparam | messageparam | otherparam | reqparam
+ standardparam  = amountparam | labelparam | messageparam | otherparam
+ bitcoinparam   = standardparam | reqparam
  amountparam    = "amount=" *digit [ "." *digit ]
  labelparam     = "label=" *pchar
  messageparam   = "message=" *pchar
  otherparam     = pchar *pchar "=" *pchar
- reqparam       = "req-" pchar *pchar "=" *pchar
+ reqparam       = "req-" standardparam
 
 === Query Keys ===