diff --git a/README.mediawiki b/README.mediawiki
index fdd27ac499..25cf8ab8e2 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -210,12 +210,12 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Standard
 | Proposed
 |-
-| 40
+| [[bip-0040.mediawiki|40]]
 | API/RPC
 | Stratum wire protocol
-| Marek Palatinus
+| Marek Palatinus, Ben van Hartingsveldt
 | Standard
-| BIP number allocated
+| Draft
 |-
 | 41
 | API/RPC
diff --git a/bip-0040.mediawiki b/bip-0040.mediawiki
new file mode 100644
index 0000000000..78166cd61b
--- /dev/null
+++ b/bip-0040.mediawiki
@@ -0,0 +1,182 @@
+<pre>
+  BIP: 40
+  Layer: API/RPC
+  Title: Stratum wire protocol
+  Author: Marek Palatinus <slush@satoshilabs.com>
+          Ben van Hartingsveldt <ben.vanhartingsveldt@yocto.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0040
+  Status: Draft
+  Type: Standards Track
+  Created: 2024-03-07
+  License: PD
+</pre>
+
+==Abstract==
+
+This document describes the Stratum wire protocol used in clients such as Electrum, and which also laid the foundation for the Stratum mining protocol, used in many Bitcoin pools.
+
+The specification is intended to set a standard for connections between clients and servers in which the client is able to request data without having to download the full blockchain.
+
+The specification consists of three parts. In the first part, the data format is defined. In the second part, the possible transport protocols (including encapsulation) are described. In the third part, the available methods are documented.
+
+==Motivation==
+
+Many clients want to give users access to the Bitcoin ecosystem. However, for specific reasons not every user is able to download the full blockchain to their machine.
+
+The Stratum wire protocol defines a way to access the blockchain without having it downloaded. For example, a client can request both the genesis block and the latest block with the same latency, because the server synchronizes and indexes all the blocks for us.
+
+==History==
+
+The Stratum wire protocol was introduced by Marek Palatinus in late 2011 and early 2012. It was a language-independent alternative to the Python-based protocol in early versions of Electrum, created by Thomas Voegtlin. The Stratum wire protocol made it possible to create compatible servers that Electrum could connect to, but it also made it possible to write alternative clients.
+
+Later in 2012, Marek Palatinus introduced Stratum for mining pools as well: The Stratum mining protocol, as defined in [[bip-0041.mediawiki|BIP 41]].
+
+==Extension<ref name="extended">This is extended specification information of the Stratum wire protocol to make it more complete. This information will not be found in any code or specification before this BIP.</ref>==
+
+This BIP has some extended specification information that isn't found in the older, legacy specifications. For backwards compatibility, it is recommended to implement the legacy specification information too, which is also described in this specification.
+
+==Specification: Data Format==
+
+Stratum leverages [https://www.jsonrpc.org/ JSON-RPC]. Both versions 1.0 and 2.0 are allowed, according to their respective rules.
+
+Additionally, it is a convention to give all Stratum methods in the <code>method</code> property a name that meets the following EBNF notation: <code>method ::= serviceType ("[" serviceVendor "]")? "." methodName</code>, where <code>serviceType</code> and <code>serviceVendor</code> are allowed to have dots and <code>methodName</code> isn't. For example, the values <code>blockchain.block.subscribe</code> and <code>blockchain.block[Electrum].subscribe</code>.
+
+The service vendor is optional. However, multiple vendors can define the same service type, so the service vendor is introduced to distinguish them. If the service vendor is absent, the default service type is executed. It is up to the server implementer which service vendor is the default.
+
+''Note: In JSON-RPC 1.0, the <code>param</code> property is an array, so everything should be passed in the right order. In JSON-RPC 2.0, named parameters are also allowed. In that case, only the parameter names that are documented should be used; otherwise, the method can fail. It is maybe also possible that a specific method (or server) only supports <code>params</code> as an array, because it doesn't know how to handle named params, even if it supports JSON-RPC 2.0.''
+
+==Specification: Transport Protocols==
+
+It is possible to send JSON-RPC messages over different transport protocols, like TCP and HTTP. It is also possible to protect these protocols with SSL/TLS.
+
+''Note: Implementers may write servers that support multiple coins, assuming that those coins all use the same port (e.g. 50001). Because HTTP and WebSockets support virtual hosting (<code>Host</code> header or <code>:authority</code> pseudo-header), it is possible to create a server on a single IP address that supports multiple coins by checking the domain name. The same is the case for the transport protocols with SSL/TLS when SNI is used. On plain TCP, virtual hosting is not possible. A similar experience can be reached by using multiple IP addresses. For IPv6, a network of /96 would be enough to hypothetically support all coins ever listed in SLIP-44. For IPv4, you would need all IPv4 addresses that exist to do the same, even the invalid ones, so a suggestion is to only use the server for coins you really need. Also, other ports could possibly be used, and in that case, a /16 IP block with all 65536 TCP ports in use will be enough to support all coins. However, because using non-standard and non-default ports is not user-friendly, this is also not recommended.''
+
+===TCP===
+
+Stratum over a TCP connection. Every JSON-RPC message (including batch messages) is sent on a single line, ending with a line-feed (<code>\n</code>), so <code>\r\n</code> is also allowed. Line-feeds inside the JSON should be encoded as usual. Both client and server can initiate a request on which the other side could respond with a result or an error. Below, the default ports of Stratum for Bitcoin are defined. Other coins can define other default ports.
+
+* Default port: <code>50001</code>
+* Letter: <code>t</code>
+
+===TCP over SSL/TLS===
+
+Stratum over a TCP connection with SSL/TLS: the same as normal TCP, but with SSL/TLS enabled.
+
+* Default port: <code>50002</code>
+* Letter: <code>s</code>
+
+===HTTP===
+
+Stratum over an HTTP connection. When communicating over HTTP, there 2 possible options: polling and pushing. In both cases, the request and response have a <code>Content-Type</code> header with the value <code>application/stratum</code>. Like in the TCP transport, the messages have to end with a line-feed (<code>\n</code>). It is possible to send multiple messages in one HTTP request or response.
+
+A request or response may contain a <code>Content-MD5</code> header to allow the receiver to detect any modification to the content. It is up to clients and servers how to handle a mismatch. A suggestion for a client would be to retry the command. A suggestion for a server would be to return a 400 error (or return a 200 error with a JSON-RPC error message).
+
+* Default port: <code>8081</code>
+* Letter: <code>h</code>
+
+====Session====
+
+Because it is not sure if an HTTP connection will stay open, it is highly possible that messages will be sent over multiple connections. To keep track of the same "session", a cookie with the name <code>STRATUM_SESSION</code> is used. If a client sends a request with a cookie, the servers knows exactly which session is used and which notifications to send.
+
+Servers could send the <code>Stratum-Session-Timeout</code><ref name="extended"/> header to tell the client when a session with the same session id will be seen as a new session by the server. The header contains a number that indicates how many seconds are left. This is different from <code>Expires</code> or <code>Max-Age</code> parameters of the <code>Set-Cookie</code> header that indicate when a cookie (not necessarily a session) should have been expired by the client. For backwards compatibility, a <code>X-Session-Timeout</code> header with the same value should be sent in those requests, too.
+
+====HTTP Poll====
+
+When polling, an HTTP POST request is sent with <code>application/stratum</code> in the <code>Content-Type</code> header. In the body, there could be one or more messages. If the body is empty, the client only wants to check for notifications.
+
+If no error occurred, the server will respond with a 200 status code and with <code>application/stratum</code> in the <code>Content-Type</code> header. If there are one or more notifications or other messages, the body will contain those messages. Otherwise, the body will be empty.
+
+====HTTP Push====
+
+HTTP Poll is the default mode when connecting with a server over HTTP. To get the session in HTTP Push mode, a client should send a regular HTTP Poll request with an additional <code>Stratum-Callback-URL</code><ref name="extended"/> header. This will let the server send notifications using the callback URL without the client needing to send HTTP poll requests with a very small interval. To disable HTTP Push mode, a regular HTTP poll request should be sent with an additional empty <code>Stratum-Callback-URL</code><ref name="extended"/> header. For backwards compatibility, a <code>X-Callback-URL</code> header with the same value should be sent in those requests too.
+
+The callback URL will be called when there are notifications. This request is an HTTP POST request with a <code>Content-Type</code> header and a <code>Stratum-Session-ID</code><ref name="extended"/> header. The <code>Stratum-Session-ID</code><ref name="extended"/> contains the same id as the <code>STRATUM_SESSION</code> cookie. This makes it possible to use the callback URL for multiple sessions. The response of the callback URL is expected to be empty, so any response body will likely be ignored. For backwards compatibility, a <code>X-Session-ID</code> header with the same value should be sent in those requests too.
+
+===HTTP over SSL/TLS===
+
+Stratum over an HTTP connection with SSL/TLS: the same as normal HTTP, but with SSL/TLS enabled.
+
+* Default port: <code>8082</code>
+* Letter: <code>g</code>
+
+===WebSocket===
+
+Stratum over a WebSocket connection. When using WebSockets, the JSON-RPC messages (including batch messages) are encapsulated in a WebSocket message. It is also possible to send multiple JSON-RPC messages in one WebSocket message. Every JSON-RPC message should end with a line-feed (<code>\n</code>). Both client and server can initiate a message request on which the other side could respond with a result or an error, like Stratum over TCP.
+
+* Default port: <code>8083</code><ref name="extended"/>
+* Letter: <code>w</code><ref name="extended"/>
+
+====Subprotocol<ref name="extended"/>====
+
+In a WebSocket upgrade request, it is possible to use the <code>Sec-WebSocket-Protocol</code> header to let the WebSocket server know which subprotocol is desired to send over the connection. For Stratum, the value <code>stratum</code> is registered. The use of this header is optional. If the server supports the use of this subprotocol too, it will let the client know by sending a <code>Sec-WebSocket-Protocol</code> header back. If the server doesn't send a subprotocol back, the connection will continue without using one. Use of this feature is fully backwards compatible.
+
+====Example====
+
+<pre>
+  // Open WebSocket with using a subprotocol
+  new WebSocket('ws://stratum.example.com:8083',['stratum']);
+
+  // Open WebSocket without using a subprotocol
+  new WebSocket('ws://stratum.example.com:8083');
+</pre>
+
+===WebSocket over SSL/TLS===
+
+Stratum over a WebSocket connection with SSL/TLS: the same as normal WebSocket, but with SSL/TLS enabled.
+
+* Default port: <code>8084</code><ref name="extended"/>
+* Letter: <code>u</code><ref name="extended"/>
+
+==Specification: Services==
+
+On top of Stratum, some services are defined. They are listed below, grouped by vendor.
+
+===Vendor: Stratum===
+
+* [[bip-0040/service-discovery.mediawiki|Discovery]]
+* [[bip-0040/service-example.mediawiki|Example]]
+* [[bip-0040/service-example.pubsub.mediawiki|Example Publish-Subscribe]]
+* [[bip-0040/service-server.mediawiki|Server]]
+* [[bip-0040/service-server.peers.mediawiki|Server Peers]]
+
+===Vendor: Electrum===
+
+* [[bip-0040/service-blockchain.mediawiki|Blockchain]]
+* [[bip-0040/service-blockchain.address.mediawiki|Blockchain Address]]
+* [[bip-0040/service-blockchain.block.mediawiki|Blockchain Block]]
+* [[bip-0040/service-blockchain.headers.mediawiki|Blockchain Headers]]
+* [[bip-0040/service-blockchain.numblocks.mediawiki|Blockchain Number of Blocks]]
+* [[bip-0040/service-blockchain.transaction.mediawiki|Blockchain Transaction]]
+* [[bip-0040/service-blockchain.utxo.mediawiki|Blockchain Unspent Transaction Output]]
+
+===Vendor: blockchain.info===
+
+* [[bip-0040/service-firstbits.mediawiki|Firstbits]]
+
+===Vendor: firstbits.com===
+
+* [[bip-0040/service-firstbits.mediawiki|Firstbits]]
+
+==IANA Considerations==
+
+===HTTP Field===
+
+IANA maintains the registry of HTTP Fields at https://www.iana.org/assignments/http-fields.
+
+This document serves as the specification for the HTTP fields "Stratum-Session-ID", "Stratum-Session-Timeout" and "Stratum-Callback-URL".
+
+===Media Type===
+
+IANA maintains the registry of Media Types [https://www.rfc-editor.org/info/bcp13 BCP13] at http://www.iana.org/assignments/media-types.
+
+This document serves as the specification for the media type "application/stratum". It has been registered with IANA.
+
+===WebSocket Subprotocol Name===
+
+IANA maintains the registry of WebSocket Subprotocol Names at https://www.iana.org/assignments/websocket.
+
+This document serves as the specification for the WebSocket subprotocol name "stratum". It has been registered with IANA.
+
+==References==
+<references/>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.address.mediawiki b/bip-0040/service-blockchain.address.mediawiki
new file mode 100644
index 0000000000..2f61af5769
--- /dev/null
+++ b/bip-0040/service-blockchain.address.mediawiki
@@ -0,0 +1,72 @@
+=Service: Blockchain Address=
+
+* Service type: <code>blockchain.address</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Get History==
+
+* Method name: <code>get_history</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>blockchain.address.get_history</code>
+|-
+! Params [0]
+| <code>string</code>
+| <code>1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L</code>
+| The address to get the history of.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+|
+| The history of the blockchain address.
+|}
+
+==Method: Get Balance==
+
+* Method name: <code>get_balance</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>blockchain.address.subscribe</code>
+|-
+! Params [0]
+| <code>string</code>
+| <code>1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L</code>
+| The address to subscribe to.
+|}
+
+==Method: Unsubscribe==
+
+* Method name: <code>unsubscribe</code>
+
+==Method: Get Memory Pool==
+
+* Method name: <code>get_mempool</code>
+
+==Method: Get Proof==
+
+* Method name: <code>get_proof</code>
+
+==Method: List Unspent==
+
+* Method name: <code>listunspent</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.block.mediawiki b/bip-0040/service-blockchain.block.mediawiki
new file mode 100644
index 0000000000..4b0e1330b8
--- /dev/null
+++ b/bip-0040/service-blockchain.block.mediawiki
@@ -0,0 +1,28 @@
+=Service: Blockchain Block=
+
+* Service type: <code>blockchain.block</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
+
+==Method: Unsubscribe==
+
+* Method name: <code>unsubscribe</code>
+
+==Method: Get Block Number==
+
+* Method name: <code>get_blocknum</code>
+
+==Method: Get Chunk==
+
+* Method name: <code>get_chunk</code>
+
+==Method: Get Header==
+
+* Method name: <code>get_header</code>
+
+==Method: Ping==
+
+* Method name: <code>ping</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.headers.mediawiki b/bip-0040/service-blockchain.headers.mediawiki
new file mode 100644
index 0000000000..891836e389
--- /dev/null
+++ b/bip-0040/service-blockchain.headers.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Headers=
+
+* Service type: <code>blockchain.headers</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.mediawiki b/bip-0040/service-blockchain.mediawiki
new file mode 100644
index 0000000000..480739772b
--- /dev/null
+++ b/bip-0040/service-blockchain.mediawiki
@@ -0,0 +1,12 @@
+=Service: Blockchain=
+
+* Service type: <code>blockchain</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Estimate Fee==
+
+* Method name: <code>estimatefee</code>
+
+==Method: Relay Fee==
+
+* Method name: <code>relayfee</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.numblocks.mediawiki b/bip-0040/service-blockchain.numblocks.mediawiki
new file mode 100644
index 0000000000..8a4f8604c7
--- /dev/null
+++ b/bip-0040/service-blockchain.numblocks.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Number of Blocks=
+
+* Service type: <code>blockchain.numblocks</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.transaction.mediawiki b/bip-0040/service-blockchain.transaction.mediawiki
new file mode 100644
index 0000000000..094dcb1e64
--- /dev/null
+++ b/bip-0040/service-blockchain.transaction.mediawiki
@@ -0,0 +1,28 @@
+=Service: Blockchain Transaction=
+
+* Service type: <code>blockchain.transaction</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+* Method name: <code>subscribe</code>
+
+==Method: Unsubscribe==
+
+* Method name: <code>unsubscribe</code>
+
+==Method: Guess Fee==
+
+* Method name: <code>guess_fee</code>
+
+==Method: Broadcast==
+
+* Method name: <code>broadcast</code>
+
+==Method: Get==
+
+* Method name: <code>get</code>
+
+==Method: Get Merkle==
+
+* Method name: <code>get_merkle</code>
\ No newline at end of file
diff --git a/bip-0040/service-blockchain.utxo.mediawiki b/bip-0040/service-blockchain.utxo.mediawiki
new file mode 100644
index 0000000000..bcc3166fb8
--- /dev/null
+++ b/bip-0040/service-blockchain.utxo.mediawiki
@@ -0,0 +1,8 @@
+=Service: Blockchain Unspent Transaction Output=
+
+* Service type: <code>blockchain.utxo</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Get Address==
+
+* Method name: <code>get_address</code>
\ No newline at end of file
diff --git a/bip-0040/service-discovery.mediawiki b/bip-0040/service-discovery.mediawiki
new file mode 100644
index 0000000000..9ad91eb12b
--- /dev/null
+++ b/bip-0040/service-discovery.mediawiki
@@ -0,0 +1,145 @@
+=Service: Discovery=
+
+* Service type: <code>discovery</code>
+* 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> of <code>string</code>s
+| <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> of <code>string</code>s
+| <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> of <code>string</code>s
+| <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 help text and parameters of the requested method.
+|-
+! Result [0] (<code>help_text</code>)
+| <code>string</code>
+| <code>Some method help text</code>
+| The help text of requested method.
+|-
+! Result [1] (<code>params</code>)
+| <code>array</code> of <code>array</code>s
+| <code>[ ["address","string","String containing full Bitcoin address."] ]</code>
+| The parameters of requested method.
+|-
+! Result [1][index] (<code>params[index]</code>)
+| <code>array</code>
+| <code>["address","string","String containing full Bitcoin address."]</code>
+| The parameter at position <code>index</code> of requested method.
+|-
+! Result [1][index][0]
+| <code>string</code>
+| <code>address</code>
+| The name of the parameter at position <code>index</code> of requested method.
+|-
+! Result [1][index][1]
+| <code>string</code>
+| <code>string</code>
+| The type of the parameter at position <code>index</code> of requested method.
+|-
+! Result [1][index][2]
+| <code>string</code>
+| <code>String containing full Bitcoin address.</code>
+| The description of the parameter at position <code>index</code> of requested method.
+|}
\ No newline at end of file
diff --git a/bip-0040/service-example.mediawiki b/bip-0040/service-example.mediawiki
new file mode 100644
index 0000000000..d4439e16b5
--- /dev/null
+++ b/bip-0040/service-example.mediawiki
@@ -0,0 +1,146 @@
+=Service: Example=
+
+This service is an example service. It doesn't have any other purpose than testing.
+
+* Service type: <code>example</code>
+* Service vendor: <code>Stratum</code>
+
+==Method: Hello World==
+
+Ask the server to send a "Hello world!" back.
+
+* Method name: <code>hello_world</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.hello_world</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code>
+| <code>Hello world!</code>
+| The "Hello world" text.
+|}
+
+==Method: Ping==
+
+Ping the server and get a pong back with the same text.
+
+* Method name: <code>ping</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.ping</code>
+|-
+! Params [0] (<code>payload</code>)
+| <code>mixed</code>
+| <code>12345678</code>
+| The ping payload.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>mixed</code>
+| <code>12345678</code>
+| The pong payload, same as the ping payload.
+|}
+
+==Method: Synchronous==
+
+Ask the server to run a synchronous command for a specific amount of seconds.
+
+* Method name: <code>synchronous</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.synchronous</code>
+|-
+! Params [0] (<code>how_long</code>)
+| <code>int</code> (or a <code>string</code> or a <code>float</code> that can be casted to an <code>int</code>)
+| <code>123</code>
+| The time to run.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code>
+| <code>Request finished in 123 seconds</code>
+| A string that tells that the command has finished running.
+|}
+
+==Method: Throw Exception==
+
+Ask the server to throw an exception.
+
+* Method name: <code>throw_exception</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.throw_exception</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Error
+| <code>object</code>
+| <code>{"code":-1,"data":"Some traceback","message":"Some error"}</code>
+| The error object.
+|}
+
+==Method: Throw Signed Exception==
+
+Ask the server to throw an exception in a signed JSON-RPC object.
+
+* Method name: <code>throw_signed_exception</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.throw_signed_exception</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Error
+| <code>object</code>
+| <code>{"code":-1,"data":"Some traceback","message":"Some error"}</code>
+| The error object.
+|}
\ No newline at end of file
diff --git a/bip-0040/service-example.pubsub.mediawiki b/bip-0040/service-example.pubsub.mediawiki
new file mode 100644
index 0000000000..77af2bc027
--- /dev/null
+++ b/bip-0040/service-example.pubsub.mediawiki
@@ -0,0 +1,99 @@
+=Service: Example Publish-Subscribe=
+
+This service is an example service. It doesn't have any other purpose than testing.
+
+* Service type: <code>example.pubsub</code>
+* Service vendor: <code>Stratum</code>
+
+==Method: Subscribe==
+
+Subscribe on an event.
+
+* Method name: <code>subscribe</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.pubsub.subscribe</code>
+|-
+! Params [0] (<code>period</code>)
+| <code>int</code>
+| <code>12</code>
+| Period to wait for next emission.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>array</code>
+| <code>["example.pubsub.time_event", "some-subscription-key"]</code>
+| The subscription information.
+|-
+! Result [0] (<code>event</code>)
+| <code>string</code>
+| <code>example.pubsub.time_event</code>
+| The subscription event name. In this case, it is <code>example.pubsub.time_event</code>.
+|-
+! Result [1] (<code>subscription_key</code>)
+| <code>string</code>
+| <code>some-subscription-key</code>
+| The subscription key of the event subscription.
+|}
+
+==Method: Time Event==
+
+The time event that gets emitted.
+
+* Method name: <code>time_event</code>
+
+{|
+! <ins>[Notification]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.pubsub.time_event</code>
+|-
+! Params [0] (<code>t</code>)
+| <code>int</code>
+| <code>1231006505</code>
+| The time when the time event was emitted.
+|}
+
+==Method: Unsubscribe==
+
+Unsubscribe from an event.
+
+* Method name: <code>unsubscribe</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>example.pubsub.unsubscribe</code>
+|-
+! Params [0] (<code>subscription_key</code>)
+| <code>string</code>
+| <code>some-subscription-key</code>
+| The subscription key of the event subscription.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>boolean</code>
+| <code>true</code>
+| True if subscription is removed from session, false if failed.
+|}
\ No newline at end of file
diff --git a/bip-0040/service-firstbits.mediawiki b/bip-0040/service-firstbits.mediawiki
new file mode 100644
index 0000000000..c440597116
--- /dev/null
+++ b/bip-0040/service-firstbits.mediawiki
@@ -0,0 +1,62 @@
+=Service: Firstbits=
+
+* Service type: <code>firstbits</code>
+* Service vendor: <code>blockchain.info</code> and <code>firstbits.com</code>
+
+==Method: Create==
+
+* Method name: <code>create</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>firstbits.create</code>
+|-
+! Params [0] (<code>address</code>)
+| <code>string</code>
+| <code>1MarekMKDKRb6PEeHeVuiCGayk9avyBGBB</code>
+| The address.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code>
+| <code>1marekm</code>
+| The firstbits string.
+|}
+
+==Method: Resolve==
+
+* Method name: <code>resolve</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>firstbits.resolve</code>
+|-
+! Params [0] (<code>firstbits</code>)
+| <code>string</code>
+| <code>1marekm</code>
+| The address.
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code>
+| <code>1MarekMKDKRb6PEeHeVuiCGayk9avyBGBB</code>
+| The address.
+|}
\ No newline at end of file
diff --git a/bip-0040/service-server.mediawiki b/bip-0040/service-server.mediawiki
new file mode 100644
index 0000000000..b616488de2
--- /dev/null
+++ b/bip-0040/service-server.mediawiki
@@ -0,0 +1,115 @@
+=Service: Server=
+
+* Service type: <code>server</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Add Peer==
+
+A command to add the node to the peer list.
+
+* Method name: <code>add_peer</code>
+
+==Method: Banner==
+
+A command to get the server banner.
+
+* Method name: <code>banner</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>server.banner</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code>
+| <code>Welcome to Electrum!</code>
+| The server banner.
+|}
+
+==Method: Cache==
+
+A command to get the server cache size.
+
+* Method name: <code>cache</code>
+
+==Method: Debug==
+
+* Method name: <code>debug</code>
+
+==Method: Donation Address==
+
+A command to get the server donation address.
+
+* Method name: <code>donation_address</code>
+
+==Method: Features==
+
+A command to get the server features.
+
+* Method name: <code>features</code>
+
+==Method: Info==
+
+A command to get information about the active sessions.
+
+* Method name: <code>info</code>
+
+==Method: Load==
+
+A command to get the server load.
+
+* Method name: <code>load</code>
+
+==Method: Peers==
+
+A event to announce peers.
+
+* Method name: <code>peers</code>
+
+==Method: Ping==
+
+A command to ping the server.
+
+* Method name: <code>ping</code>
+
+==Method: Stop==
+
+A command to stop the server.
+
+* Method name: <code>stop</code>
+
+==Method: Version==
+
+A command to set the client version, get the server version and negotiate the protocol version.
+
+* Method name: <code>version</code>
+* Introduced in: <code>0.1</code>
+
+{|
+! <ins>[Request]</ins>
+! Type
+! Example
+! Description
+|-
+! Method
+| colspan="3" | <code>server.version</code>
+|-
+! <ins>[Response]</ins>
+! Type
+! Example
+! Description
+|-
+! Result
+| <code>string</code> or <code>array</code>
+| <code>Welcome to Electrum!</code>
+| The server banner.
+|}
\ No newline at end of file
diff --git a/bip-0040/service-server.peers.mediawiki b/bip-0040/service-server.peers.mediawiki
new file mode 100644
index 0000000000..1d93a48003
--- /dev/null
+++ b/bip-0040/service-server.peers.mediawiki
@@ -0,0 +1,10 @@
+=Service: Server Peers=
+
+* Service type: <code>server.peers</code>
+* Service vendor: <code>Electrum</code>
+
+==Method: Subscribe==
+
+A command to get current peers.
+
+* Method name: <code>subscribe</code>
\ No newline at end of file
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index 4923a9ed4f..fde26ef2dc 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -87,7 +87,7 @@
 	'OPL' => undef,
 	'PD' => undef,
 );
-my %GrandfatheredPD = map { $_ => undef } qw(9 36 37 38 42 49 50 60 65 67 69 74 80 81 83 90 99 105 107 109 111 112 113 114 122 124 125 126 130 131 132 133 140 141 142 143 144 146 147 150 151 152);
+my %GrandfatheredPD = map { $_ => undef } qw(9 36 37 38 40 42 49 50 60 65 67 69 74 80 81 83 90 99 105 107 109 111 112 113 114 122 124 125 126 130 131 132 133 140 141 142 143 144 146 147 150 151 152);
 my %TolerateMissingLicense = map { $_ => undef } qw(1 10 11 12 13 14 15 16 21 31 33 34 35 39 43 44 45 47 61 64 68 70 71 72 73 101 102 106 120 121);
 my %TolerateTitleTooLong = map { $_ => undef } qw(39 44 45 47 49 60 67 68 69 73 74 75 80 81 99 105 106 109 113 122 126 131 143 145 147 173 327);