diff --git a/bip-0021.mediawiki b/bip-0021.mediawiki
index fa77e4b5..c4f3ef7a 100644
--- a/bip-0021.mediawiki
+++ b/bip-0021.mediawiki
@@ -1,3 +1,5 @@
+{{bip}}
+
 <pre>
   BIP: 21
   Title: URI Scheme
@@ -33,13 +35,12 @@ Graphical bitcoin clients SHOULD register themselves as the handler for the "bit
  bitcoinurn     = "bitcoin:" bitcoinaddress [ "?" bitcoinparams ]
  bitcoinaddress = base58 *base58
  bitcoinparams  = *bitcoinparam
- standardparam  = amountparam | labelparam | messageparam | otherparam
- bitcoinparam   = standardparam | reqparam
+ bitcoinparam   = amountparam | labelparam | messageparam | otherparam | reqparam
  amountparam    = "amount=" *digit [ "." *digit ]
  labelparam     = "label=" *pchar
  messageparam   = "message=" *pchar
  otherparam     = pchar *pchar "=" *pchar
- reqparam       = "req-" standardparam
+ reqparam       = "req-" pchar *pchar "=" *pchar
 
 === Query Keys ===
 
@@ -85,7 +86,7 @@ Please see the [[#BNF grammar|BNF grammar]] above for the normative syntax.
 
 [foo] means optional, <bar> are placeholders
 
- bitcoin:<address>[?amount=<amount>][?label=<label>][?message=<message>]
+ <nowiki>bitcoin:<address>[?amount=<amount>][?label=<label>][?message=<message>]</nowiki>
 
 === Examples ===
 
@@ -116,4 +117,3 @@ Characters must be URI encoded properly.
 [[Category:Developer]]
 [[Category:Technical]]
 [[Category:BIP|D]]
-