diff --git a/bip-0040/service-blockchain.address.mediawiki b/bip-0040/service-blockchain.address.mediawiki
index 5237c57b..379953bd 100644
--- a/bip-0040/service-blockchain.address.mediawiki
+++ b/bip-0040/service-blockchain.address.mediawiki
@@ -16,7 +16,7 @@
 ! Method
 | colspan="3" | <code>blockchain.address.get_history</code>
 |-
-! Param [0]
+! Params [0]
 | <code>string</code>
 | <code>1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L</code>
 | The address to get the history of.
@@ -45,7 +45,7 @@
 ! Method
 | colspan="3" | <code>blockchain.address.subscribe</code>
 |-
-! Param [0]
+! Params [0]
 | <code>string</code>
 | <code>1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L</code>
 | The address to subscribe to.
diff --git a/bip-0040/service-discovery.mediawiki b/bip-0040/service-discovery.mediawiki
index a843f22a..188d5283 100644
--- a/bip-0040/service-discovery.mediawiki
+++ b/bip-0040/service-discovery.mediawiki
@@ -1,4 +1,115 @@
 =Service: Discovery=
 
 * Service type: <code>discovery</code>
-* Service vendor: <code>Stratum</code>
\ No newline at end of file
+* Service vendor: <code>Stratum</code>
+
+==Method: List Services==
+
+* Method name: <code>list_services</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>discovery.list_services</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+| <code>["discovery","example","example.pubsub"]</code>
+| The services that are implemented by the server.
+|}
+
+==Method: List Vendors==
+
+* Method name: <code>list_vendors</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>discovery.list_vendors</code>
+|-
+! Params [0] (<code>service_type</code>)
+| <code>string</code>
+| <code>firstbits</code>
+| The service you want all the vendors of.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+| <code>["blockchain.info","firstbits.com"]</code>
+| The vendors of the requested service.
+|}
+
+==Method: List Methods==
+
+* Method name: <code>list_methods</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>discovery.list_methods</code>
+|-
+! Params [0] (<code>service_name</code>)
+| <code>string</code>
+| <code>firstbits[firstbits.com]</code>
+| The service name (eventually including a service vendor in square brackets).
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+| <code>["create","resolve"]</code>
+| The methods of the requested service.
+|}
+
+==Method: List Params==
+
+* Method name: <code>list_params</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>discovery.list_params</code>
+|-
+! Params [0] (<code>method</code>)
+| <code>string</code>
+| <code>firstbits[firstbits.com].create</code>
+| The full method name, including the service name (and possibly the service vendor in square brackets).
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+| <code>["Some method help text",[ ["address","string","String containing full Bitcoin address."] ]].</code>
+| The parameters of the requested method.
+|}
\ No newline at end of file