diff --git a/README.mediawiki b/README.mediawiki
index ed469170..a5bed78d 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -12,18 +12,18 @@ Those proposing changes should consider that ultimately consent may rest with th
 !Owner
 !Type
 !Status
-|- style="background-color: #cfffcf"
+|- style="background-color: #ffcfcf"
 | [[bip-0001.mediawiki|1]]
 | BIP Purpose and Guidelines
 | Amir Taaki
 | Process
-| Active
-|-
+| Replaced
+|- style="background-color: #cfffcf"
 | [[bip-0002.mediawiki|2]]
 | BIP process, revised
 | Luke Dashjr
 | Process
-| Draft
+| Active
 |- style="background-color: #cfffcf"
 | [[bip-0009.mediawiki|9]]
 | Version bits with timeout and delay
@@ -83,7 +83,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | hashScriptCheck
 | Luke Dashjr
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0019.mediawiki|19]]
 | M-of-N Standard Transactions (Low SigOp)
@@ -173,7 +173,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Mnemonic code for generating deterministic keys
 | Marek Palatinus, Pavol Rusnak, Aaron Voisine, Sean Bowe
 | Standard
-| Accepted
+| Proposed
 |-
 | 40
 | Stratum wire protocol
@@ -203,13 +203,13 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Multi-Account Hierarchy for Deterministic Wallets
 | Marek Palatinus, Pavol Rusnak
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #ffffcf"
 | [[bip-0045.mediawiki|45]]
 | Structure for Deterministic P2SH Multisignature Wallets
 | Manuel Araoz, Ryan X. Charles, Matias Alejo Garcia
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0047.mediawiki|47]]
 | Reusable Payment Codes for Hierarchical Deterministic Wallets
@@ -276,7 +276,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Deterministic Pay-to-script-hash multi-signature addresses through public key sorting
 | Thomas Kerin, Jean-Pierre Rupp, Ruben de Vries
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0068.mediawiki|68]]
 | Relative lock-time using consensus-enforced sequence numbers
@@ -288,7 +288,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Lexicographical Indexing of Transaction Inputs and Outputs
 | Kristov Atlas
 | Informational
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0070.mediawiki|70]]
 | Payment Protocol
@@ -402,7 +402,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | NODE_BLOOM service bit
 | Matt Corallo, Peter Todd
 | Standard
-| Accepted
+| Proposed
 |- style="background-color: #cfffcf"
 | [[bip-0112.mediawiki|112]]
 | CHECKSEQUENCEVERIFY
@@ -439,12 +439,12 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Marco Pontello
 | Standard
 | Draft
-|-
+|- style="background-color: #cfffcf"
 | [[bip-0123.mediawiki|123]]
 | BIP Classification
 | Eric Lombrozo
 | Process
-| Draft
+| Active
 |-
 | [[bip-0124.mediawiki|124]]
 | Hierarchical Deterministic Script Templates
@@ -456,7 +456,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | Opt-in Full Replace-by-Fee Signaling
 | David A. Harding, Peter Todd
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0126.mediawiki|126]]
 | Best Practices for Heterogeneous Input Script Transactions
@@ -468,7 +468,7 @@ Those proposing changes should consider that ultimately consent may rest with th
 | sendheaders message
 | Suhas Daftuar
 | Standard
-| Accepted
+| Proposed
 |-
 | [[bip-0131.mediawiki|131]]
 | "Coalescing Transaction" Specification (wildcard inputs)
diff --git a/bip-0001.mediawiki b/bip-0001.mediawiki
index 44fbe8b2..b1947ea3 100644
--- a/bip-0001.mediawiki
+++ b/bip-0001.mediawiki
@@ -2,9 +2,12 @@
   BIP: 1
   Title: BIP Purpose and Guidelines
   Author: Amir Taaki <genjix@riseup.net>
-  Status: Active
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0001
+  Status: Replaced
   Type: Process
   Created: 2011-08-19
+  Superseded-By: 2
 </pre>
 
 ==What is a BIP?==
diff --git a/bip-0002.mediawiki b/bip-0002.mediawiki
index 47967711..ea60d1d7 100644
--- a/bip-0002.mediawiki
+++ b/bip-0002.mediawiki
@@ -2,9 +2,13 @@
   BIP: 2
   Title: BIP process, revised
   Author: Luke Dashjr <luke+bip@dashjr.org>
-  Status: Draft
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0002
+  Status: Active
   Type: Process
   Created: 2016-02-03
+  License: BSD-2-Clause
+           OPL
   Replaces: 1
 </pre>
 
diff --git a/bip-0009.mediawiki b/bip-0009.mediawiki
index 536ef1f0..11e35051 100644
--- a/bip-0009.mediawiki
+++ b/bip-0009.mediawiki
@@ -5,9 +5,12 @@
           Peter Todd <pete@petertodd.org>
           Greg Maxwell <greg@xiph.org>
           Rusty Russell <rusty@rustcorp.com.au>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0009
   Status: Final
   Type: Informational
   Created: 2015-10-04
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0010.mediawiki b/bip-0010.mediawiki
index d15cd77e..42071f3a 100644
--- a/bip-0010.mediawiki
+++ b/bip-0010.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 10
+  Layer: Applications
   Title: Multi-Sig Transaction Distribution
   Author: Alan Reiner <etotheipi@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0010
   Status: Withdrawn
   Type: Informational
   Created: 2011-10-28
diff --git a/bip-0011.mediawiki b/bip-0011.mediawiki
index 4b12340d..bb0a3088 100644
--- a/bip-0011.mediawiki
+++ b/bip-0011.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 11
+  Layer: Applications
   Title: M-of-N Standard Transactions
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0011
   Status: Final
   Type: Standards Track
   Created: 2011-10-18
diff --git a/bip-0012.mediawiki b/bip-0012.mediawiki
index ee2fda6b..9cb3795c 100644
--- a/bip-0012.mediawiki
+++ b/bip-0012.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 12
+  Layer: Consensus (soft fork)
   Title: OP_EVAL
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0012
   Status: Withdrawn
   Type: Standards Track
   Created: 2011-10-18
diff --git a/bip-0013.mediawiki b/bip-0013.mediawiki
index a537d16a..9805ed0b 100644
--- a/bip-0013.mediawiki
+++ b/bip-0013.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 13
+  Layer: Applications
   Title: Address Format for pay-to-script-hash
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0013
   Status: Final
   Type: Standards Track
   Created: 2011-10-18
diff --git a/bip-0014.mediawiki b/bip-0014.mediawiki
index f11cb630..abd575ce 100644
--- a/bip-0014.mediawiki
+++ b/bip-0014.mediawiki
@@ -1,8 +1,11 @@
 <pre>
   BIP: 14
+  Layer: Peer Services
   Title: Protocol Version and User Agent
   Author: Amir Taaki <genjix@riseup.net>
           Patrick Strateman <bitcoin-bips@covertinferno.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0014
   Status: Final
   Type: Standards Track
   Created: 2011-11-10
diff --git a/bip-0015.mediawiki b/bip-0015.mediawiki
index b90539da..a6e4426a 100644
--- a/bip-0015.mediawiki
+++ b/bip-0015.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 15
+  Layer: Applications
   Title: Aliases
   Author: Amir Taaki <genjix@riseup.net>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0015
   Status: Deferred
   Type: Standards Track
   Created: 2011-12-10
diff --git a/bip-0016.mediawiki b/bip-0016.mediawiki
index 25b652db..d5d39ef1 100644
--- a/bip-0016.mediawiki
+++ b/bip-0016.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 16
+  Layer: Consensus (soft fork)
   Title: Pay to Script Hash
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0016
   Status: Final
   Type: Standards Track
   Created: 2012-01-03
diff --git a/bip-0017.mediawiki b/bip-0017.mediawiki
index 38634879..671f75ab 100644
--- a/bip-0017.mediawiki
+++ b/bip-0017.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 17
+  Layer: Consensus (soft fork)
   Title: OP_CHECKHASHVERIFY (CHV)
   Author: Luke Dashjr <luke+bip17@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0017
   Status: Withdrawn
   Type: Standards Track
   Created: 2012-01-18
+  License: BSD-2-Clause
 </pre>
 
 ==Abstract==
diff --git a/bip-0018.mediawiki b/bip-0018.mediawiki
index 15e44187..a82ab441 100644
--- a/bip-0018.mediawiki
+++ b/bip-0018.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 18
+  Layer: Consensus (soft fork)
   Title: hashScriptCheck
   Author: Luke Dashjr <luke+bip17@dashjr.org>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0018
+  Status: Proposed
   Type: Standards Track
   Created: 2012-01-27
+  License: BSD-2-Clause
 </pre>
 
 ==Abstract==
diff --git a/bip-0019.mediawiki b/bip-0019.mediawiki
index 228fdc83..99462b7f 100644
--- a/bip-0019.mediawiki
+++ b/bip-0019.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 19
+  Layer: Applications
   Title: M-of-N Standard Transactions (Low SigOp)
   Author: Luke Dashjr <luke+bip17@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0019
   Status: Draft
   Type: Standards Track
   Created: 2012-01-30
+  License: BSD-2-Clause
 </pre>
 
 ==Abstract==
diff --git a/bip-0020.mediawiki b/bip-0020.mediawiki
index ff7fdedd..fc3c0eaa 100644
--- a/bip-0020.mediawiki
+++ b/bip-0020.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 20
+  Layer: Applications
   Title: URI Scheme
   Author: Luke Dashjr <luke+bip@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0020
   Status: Replaced
   Type: Standards Track
   Created: 2011-01-10
+  License: BSD-2-Clause
 </pre>
 
 BIP 0020 is based off an earlier document by Nils Schneider. '''And has been replaced by BIP 0021'''
diff --git a/bip-0021.mediawiki b/bip-0021.mediawiki
index 513b8bb8..cfab8564 100644
--- a/bip-0021.mediawiki
+++ b/bip-0021.mediawiki
@@ -1,8 +1,11 @@
 <pre>
   BIP: 21
+  Layer: Applications
   Title: URI Scheme
   Author: Nils Schneider <nils.schneider@gmail.com>
           Matt Corallo <bip21@bluematt.me>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0021
   Status: Final
   Type: Standards Track
   Created: 2012-01-29
diff --git a/bip-0022.mediawiki b/bip-0022.mediawiki
index 82a13bfc..45ebacf8 100644
--- a/bip-0022.mediawiki
+++ b/bip-0022.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 22
+  Layer: API/RPC
   Title: getblocktemplate - Fundamentals
   Author: Luke Dashjr <luke+bip22@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0022
   Status: Final
   Type: Standards Track
   Created: 2012-02-28
+  License: BSD-2-Clause
 </pre>
 
 ==Abstract==
diff --git a/bip-0023.mediawiki b/bip-0023.mediawiki
index 1c7e721b..4974a3a3 100644
--- a/bip-0023.mediawiki
+++ b/bip-0023.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 23
+  Layer: API/RPC
   Title: getblocktemplate - Pooled Mining
   Author: Luke Dashjr <luke+bip22@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0023
   Status: Final
   Type: Standards Track
   Created: 2012-02-28
+  License: BSD-2-Clause
 </pre>
 
 ==Abstract==
diff --git a/bip-0030.mediawiki b/bip-0030.mediawiki
index 135d3006..56ef3dee 100644
--- a/bip-0030.mediawiki
+++ b/bip-0030.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 30
+  Layer: Consensus (soft fork)
   Title: Duplicate transactions
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0030
   Status: Final
   Type: Standards Track
   Created: 2012-02-22
diff --git a/bip-0031.mediawiki b/bip-0031.mediawiki
index 1bfe143c..7f4cec45 100644
--- a/bip-0031.mediawiki
+++ b/bip-0031.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 31
+  Layer: Peer Services
   Title: Pong message
   Author: Mike Hearn <hearn@google.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0031
   Status: Final
   Type: Standards Track
   Created: 2012-04-11
diff --git a/bip-0032.mediawiki b/bip-0032.mediawiki
index 0c660ad8..50964a2b 100644
--- a/bip-0032.mediawiki
+++ b/bip-0032.mediawiki
@@ -6,8 +6,11 @@ RECENT CHANGES:
 
 <pre>
   BIP: 32
+  Layer: Applications
   Title: Hierarchical Deterministic Wallets
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0032
   Status: Final
   Type: Informational
   Created: 2012-02-11
diff --git a/bip-0033.mediawiki b/bip-0033.mediawiki
index 6768e198..d95357d1 100644
--- a/bip-0033.mediawiki
+++ b/bip-0033.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 33
+  Layer: Peer Services
   Title: Stratized Nodes
   Author: Amir Taaki <genjix@riseup.net>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0033
   Status: Draft
   Type: Standards Track
   Created: 2012-05-15
diff --git a/bip-0034.mediawiki b/bip-0034.mediawiki
index 4870fc13..a993b7e7 100644
--- a/bip-0034.mediawiki
+++ b/bip-0034.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 34
+  Layer: Consensus (soft fork)
   Title: Block v2, Height in Coinbase
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0034
   Status: Final
   Type: Standards Track
   Created: 2012-07-06
diff --git a/bip-0035.mediawiki b/bip-0035.mediawiki
index c66735ca..64edaf5d 100644
--- a/bip-0035.mediawiki
+++ b/bip-0035.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 35
+  Layer: Peer Services
   Title: mempool message
   Author: Jeff Garzik <jgarzik@exmulti.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0035
   Status: Final
   Type: Standards Track
   Created: 2012-08-16
diff --git a/bip-0036.mediawiki b/bip-0036.mediawiki
index 9c61fdb6..d3e36f48 100644
--- a/bip-0036.mediawiki
+++ b/bip-0036.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 36
+  Layer: Peer Services
   Title: Custom Services
   Author: Stefan Thomas <justmoon@members.fsf.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0036
   Status: Draft
   Type: Standards Track
   Created: 2012-08-03
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0037.mediawiki b/bip-0037.mediawiki
index eba06287..d817bc01 100644
--- a/bip-0037.mediawiki
+++ b/bip-0037.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 37
+  Layer: Peer Services
   Title: Connection Bloom filtering
   Author: Mike Hearn <hearn@google.com>
           Matt Corallo <bip37@bluematt.me>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0037
   Status: Final
   Type: Standards Track
   Created: 2012-10-24
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0038.mediawiki b/bip-0038.mediawiki
index 650b7d02..e1e35585 100644
--- a/bip-0038.mediawiki
+++ b/bip-0038.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 38
+  Layer: Applications
   Title: Passphrase-protected private key
   Author: Mike Caldwell <mcaldwell@swipeclock.com>
           Aaron Voisine <voisine@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0038
   Status: Draft (Some confusion applies: The announcements for this never made it to the list, so it hasn't had public discussion)
   Type: Standards Track
   Created: 2012-11-20
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0039.mediawiki b/bip-0039.mediawiki
index f0f59099..4a6b41e0 100644
--- a/bip-0039.mediawiki
+++ b/bip-0039.mediawiki
@@ -1,11 +1,14 @@
 <pre>
   BIP: 39
+  Layer: Applications
   Title: Mnemonic code for generating deterministic keys
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
           Aaron Voisine <voisine@gmail.com>
           Sean Bowe <ewillbefull@gmail.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0039
+  Status: Proposed
   Type: Standards Track
   Created: 2013-09-10
 </pre>
diff --git a/bip-0042.mediawiki b/bip-0042.mediawiki
index d7ce71c4..1b80605e 100644
--- a/bip-0042.mediawiki
+++ b/bip-0042.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 42
+  Layer: Consensus (soft fork)
   Title: A finite monetary supply for Bitcoin
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0042
   Status: Draft
   Type: Standards Track
   Created: 2014-04-01
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0043.mediawiki b/bip-0043.mediawiki
index 686221aa..85578d86 100644
--- a/bip-0043.mediawiki
+++ b/bip-0043.mediawiki
@@ -1,8 +1,11 @@
 <pre>
   BIP: 43
+  Layer: Applications
   Title: Purpose Field for Deterministic Wallets
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0043
   Status: Draft
   Type: Informational
   Created: 2014-04-24
diff --git a/bip-0044.mediawiki b/bip-0044.mediawiki
index c289887a..b13ba54e 100644
--- a/bip-0044.mediawiki
+++ b/bip-0044.mediawiki
@@ -1,9 +1,12 @@
 <pre>
   BIP: 44
+  Layer: Applications
   Title: Multi-Account Hierarchy for Deterministic Wallets
   Author: Marek Palatinus <slush@satoshilabs.com>
           Pavol Rusnak <stick@satoshilabs.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0044
+  Status: Proposed
   Type: Standards Track
   Created: 2014-04-24
 </pre>
diff --git a/bip-0045.mediawiki b/bip-0045.mediawiki
index 757fc7fe..d3647842 100644
--- a/bip-0045.mediawiki
+++ b/bip-0045.mediawiki
@@ -1,10 +1,13 @@
 <pre>
   BIP: 45
+  Layer: Applications
   Title: Structure for Deterministic P2SH Multisignature Wallets
   Author: Manuel Araoz <manu@bitpay.com>
           Ryan X. Charles <ryan@bitpay.com>
           Matias Alejo Garcia <matias@bitpay.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0045
+  Status: Proposed
   Type: Standards Track
   Created: 2014-04-25
 </pre>
diff --git a/bip-0047.mediawiki b/bip-0047.mediawiki
index b1145b38..e16dd7f9 100644
--- a/bip-0047.mediawiki
+++ b/bip-0047.mediawiki
@@ -5,8 +5,11 @@ RECENT CHANGES:
 
 <pre>
   BIP: 47
+  Layer: Applications
   Title: Reusable Payment Codes for Hierarchical Deterministic Wallets
   Author: Justus Ranvier <justus@openbitcoinprivacyproject.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0047
   Status: Draft
   Type: Informational
   Created: 2015-04-24
diff --git a/bip-0049.mediawiki b/bip-0049.mediawiki
index 4460ba76..109fde87 100644
--- a/bip-0049.mediawiki
+++ b/bip-0049.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 49
+  Layer: Applications
   Title: Derivation scheme for P2WPKH-nested-in-P2SH based accounts
   Author: Daniel Weigl <Daniel.Weigl@mycelium.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0049
   Status: Draft
   Type: Informational
   Created: 2016-05-19
+  License: PD
 </pre>
 
 ==Abstract==
@@ -101,4 +105,4 @@ This BIP is not backwards compatible by design as described under [#consideratio
 
 == Copyright ==
 
-This document is placed in the public domain.
\ No newline at end of file
+This document is placed in the public domain.
diff --git a/bip-0050.mediawiki b/bip-0050.mediawiki
index fbc1c0f4..0b41c8d2 100644
--- a/bip-0050.mediawiki
+++ b/bip-0050.mediawiki
@@ -2,9 +2,12 @@
   BIP: 50
   Title: March 2013 Chain Fork Post-Mortem
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0050
   Status: Final
   Type: Informational
   Created: 2013-03-20
+  License: PD
 </pre>
 
 ==What went wrong==
diff --git a/bip-0060.mediawiki b/bip-0060.mediawiki
index ae9592ad..4627dfbe 100644
--- a/bip-0060.mediawiki
+++ b/bip-0060.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 60
+  Layer: Peer Services
   Title: Fixed Length "version" Message (Relay-Transactions Field)
   Author: Amir Taaki <genjix@riseup.net>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0060
   Status: Draft
   Type: Standards Track
   Created: 2013-06-16
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0061.mediawiki b/bip-0061.mediawiki
index aca329a7..20606585 100644
--- a/bip-0061.mediawiki
+++ b/bip-0061.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 61
+  Layer: Peer Services
   Title: Reject P2P message
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0061
   Status: Final
   Type: Standards Track
   Created: 2014-06-18
diff --git a/bip-0062.mediawiki b/bip-0062.mediawiki
index 28b20dd8..deff62b8 100644
--- a/bip-0062.mediawiki
+++ b/bip-0062.mediawiki
@@ -2,8 +2,11 @@
 
 <pre>
   BIP: 62
+  Layer: Consensus (soft fork)
   Title: Dealing with malleability
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0062
   Status: Withdrawn
   Type: Standards Track
   Created: 2014-03-12
diff --git a/bip-0064.mediawiki b/bip-0064.mediawiki
index b03dcac1..22e56ba3 100644
--- a/bip-0064.mediawiki
+++ b/bip-0064.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 64
+  Layer: Peer Services
   Title: getutxo message
   Author: Mike Hearn <hearn@vinumeris.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0064
   Status: Draft
   Type: Standards Track
   Created: 2014-06-10
@@ -100,4 +103,4 @@ results.
 
 ==Implementation==
 
-https://github.com/bitcoin/bitcoin/pull/4351/files
\ No newline at end of file
+https://github.com/bitcoin/bitcoin/pull/4351/files
diff --git a/bip-0065.mediawiki b/bip-0065.mediawiki
index 99298bf1..904dc162 100644
--- a/bip-0065.mediawiki
+++ b/bip-0065.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 65
+  Layer: Consensus (soft fork)
   Title: OP_CHECKLOCKTIMEVERIFY
   Author: Peter Todd <pete@petertodd.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0065
   Status: Final
   Type: Standards Track
   Created: 2014-10-01
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0066.mediawiki b/bip-0066.mediawiki
index 1235afde..d2ab1893 100644
--- a/bip-0066.mediawiki
+++ b/bip-0066.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 66
+  Layer: Consensus (soft fork)
   Title: Strict DER signatures
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0066
   Status: Final
   Type: Standards Track
   Created: 2015-01-10
diff --git a/bip-0067.mediawiki b/bip-0067.mediawiki
index e266ab85..9baf6c0b 100644
--- a/bip-0067.mediawiki
+++ b/bip-0067.mediawiki
@@ -1,12 +1,16 @@
 <pre>
   BIP: 67
+  Layer: Applications
   Title: Deterministic Pay-to-script-hash multi-signature addresses through public key sorting
   Author: Thomas Kerin <me@thomaskerin.io>
           Jean-Pierre Rupp <root@haskoin.com>
           Ruben de Vries <ruben@rubensayshi.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0067
+  Status: Proposed
   Type: Standards Track
   Created: 2015-02-08
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0068.mediawiki b/bip-0068.mediawiki
index 923441ec..ea0761d5 100644
--- a/bip-0068.mediawiki
+++ b/bip-0068.mediawiki
@@ -1,10 +1,13 @@
 <pre>
   BIP: 68
+  Layer: Consensus (soft fork)
   Title: Relative lock-time using consensus-enforced sequence numbers
   Author: Mark Friedenbach <mark@friedenbach.org>
           BtcDrak <btcdrak@gmail.com>
           Nicolas Dorier <nicolas.dorier@gmail.com>
           kinoshitajona <kinoshitajona@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0068
   Status: Final
   Type: Standards Track
   Created: 2015-05-28
diff --git a/bip-0069.mediawiki b/bip-0069.mediawiki
index 832438c4..f262126a 100644
--- a/bip-0069.mediawiki
+++ b/bip-0069.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 69
+  Layer: Applications
   Title: Lexicographical Indexing of Transaction Inputs and Outputs
   Author: Kristov Atlas <kristov@openbitcoinprivacyproject.org>
   Editor: Daniel Cousens <bips@dcousens.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0069
+  Status: Proposed
   Type: Informational
   Created: 2015-06-12
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0070.mediawiki b/bip-0070.mediawiki
index e3c17cf0..28349ee3 100644
--- a/bip-0070.mediawiki
+++ b/bip-0070.mediawiki
@@ -1,8 +1,11 @@
 <pre>
   BIP: 70
+  Layer: Applications
   Title: Payment Protocol
   Author: Gavin Andresen <gavinandresen@gmail.com>
           Mike Hearn <mhearn@bitcoinfoundation.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0070
   Status: Final
   Type: Standards Track
   Created: 2013-07-29
diff --git a/bip-0071.mediawiki b/bip-0071.mediawiki
index 1fc84892..b4e9def0 100644
--- a/bip-0071.mediawiki
+++ b/bip-0071.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 71
+  Layer: Applications
   Title: Payment Protocol MIME types
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0071
   Status: Final
   Type: Standards Track
   Created: 2013-07-29
diff --git a/bip-0072.mediawiki b/bip-0072.mediawiki
index 4dcc48b5..d5e295e1 100644
--- a/bip-0072.mediawiki
+++ b/bip-0072.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 72
+  Layer: Applications
   Title: bitcoin: uri extensions for Payment Protocol
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0072
   Status: Final
   Type: Standards Track
   Created: 2013-07-29
diff --git a/bip-0073.mediawiki b/bip-0073.mediawiki
index 41c89a30..e8a37a59 100644
--- a/bip-0073.mediawiki
+++ b/bip-0073.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 73
+  Layer: Applications
   Title: Use "Accept" header for response type negotiation with Payment Request URLs
   Author: Stephen Pair <stephen@bitpay.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0073
   Status: Final
   Type: Standards Track
   Created: 2013-08-27
diff --git a/bip-0074.mediawiki b/bip-0074.mediawiki
index a860b381..d1f1a231 100644
--- a/bip-0074.mediawiki
+++ b/bip-0074.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 74
+  Layer: Applications
   Title: Allow zero value OP_RETURN in Payment Protocol
   Author: Toby Padilla <tobypadilla@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0074
   Status: Draft
   Type: Standards Track
   Created: 2016-01-29
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0075.mediawiki b/bip-0075.mediawiki
index 878d708e..33e2747c 100644
--- a/bip-0075.mediawiki
+++ b/bip-0075.mediawiki
@@ -1,10 +1,13 @@
 <pre>
   BIP: 75
+  Layer: Applications
   Title: Out of Band Address Exchange using Payment Protocol Encryption
   Author: Justin Newton <justin@netki.com>
           Matt David <mgd@mgddev.com>
           Aaron Voisine <voisine@gmail.com>
           James MacWhyte <macwhyte@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0075
   Status: Draft
   Type: Standards Track
   Created: 2015-11-20
diff --git a/bip-0080.mediawiki b/bip-0080.mediawiki
index 05322e08..2c4d8a7f 100644
--- a/bip-0080.mediawiki
+++ b/bip-0080.mediawiki
@@ -3,9 +3,12 @@
   Title: Hierarchy for Non-Colored Voting Pool Deterministic Multisig Wallets
   Author: Justus Ranvier <justus@opentransactions.org>
           Jimmy Song <jimmy@monetas.net>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0080
   Status: Deferred
   Type: Informational
   Created: 2014-08-11
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0081.mediawiki b/bip-0081.mediawiki
index 713cb572..e88ee146 100644
--- a/bip-0081.mediawiki
+++ b/bip-0081.mediawiki
@@ -3,9 +3,12 @@
   Title: Hierarchy for Colored Voting Pool Deterministic Multisig Wallets
   Author: Justus Ranvier <justus@opentransactions.org>
           Jimmy Song <jimmy@monetas.net>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0081
   Status: Deferred
   Type: Informational
   Created: 2014-08-11
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0083.mediawiki b/bip-0083.mediawiki
index f6aa8e77..a0b1e5ee 100644
--- a/bip-0083.mediawiki
+++ b/bip-0083.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 83
+  Layer: Applications
   Title: Dynamic Hierarchical Deterministic Key Trees
   Author: Eric Lombrozo <eric@ciphrex.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0083
   Status: Draft
   Type: Standards Track
   Created: 2015-11-16
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0090.mediawiki b/bip-0090.mediawiki
index 342657c7..653e40dc 100644
--- a/bip-0090.mediawiki
+++ b/bip-0090.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 90
+  Layer: Consensus (hard fork)
   Title: Buried Deployments
   Author: Suhas Daftuar <sdaftuar@chaincode.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0090
   Status: Draft
   Type: Informational
   Created: 2016-11-08
+  License: PD
 </pre>
 
 
diff --git a/bip-0099.mediawiki b/bip-0099.mediawiki
index 3e0a43a8..cbde553f 100644
--- a/bip-0099.mediawiki
+++ b/bip-0099.mediawiki
@@ -2,9 +2,12 @@
   BIP: 99
   Title: Motivation and deployment of consensus rule changes ([soft/hard]forks)
   Author: Jorge Timón <jtimon@jtimon.cc>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0099
   Status: Draft
   Type: Informational
   Created: 2015-06-20
+  License: PD
   Post-History: http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-June/008936.html
 </pre>
 
diff --git a/bip-0101.mediawiki b/bip-0101.mediawiki
index cc8cfd5f..03215697 100644
--- a/bip-0101.mediawiki
+++ b/bip-0101.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 101
+  Layer: Consensus (hard fork)
   Title: Increase maximum block size
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0101
   Status: Withdrawn
   Type: Standards Track
   Created: 2015-06-22
diff --git a/bip-0102.mediawiki b/bip-0102.mediawiki
index fc909f75..ed6b4e32 100644
--- a/bip-0102.mediawiki
+++ b/bip-0102.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 102
+  Layer: Consensus (hard fork)
   Title: Block size increase to 2MB
   Author: Jeff Garzik <jgarzik@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0102
   Status: Draft
   Type: Standards Track
   Created: 2015-06-23
diff --git a/bip-0103.mediawiki b/bip-0103.mediawiki
index 39e8a3f6..7cef84a1 100644
--- a/bip-0103.mediawiki
+++ b/bip-0103.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 103
+  Layer: Consensus (hard fork)
   Title: Block size following technological growth
   Author: Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0103
   Status: Draft
   Type: Standards Track
   Created: 2015-07-21
diff --git a/bip-0105.mediawiki b/bip-0105.mediawiki
index c4f0a099..125d8524 100644
--- a/bip-0105.mediawiki
+++ b/bip-0105.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 105
+  Layer: Consensus (hard fork)
   Title: Consensus based block size retargeting algorithm
   Author: BtcDrak <btcdrak@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0105
   Status: Draft
   Type: Standards Track
   Created: 2015-08-21
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0106.mediawiki b/bip-0106.mediawiki
index e9018fac..399c725f 100644
--- a/bip-0106.mediawiki
+++ b/bip-0106.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 106
+  Layer: Consensus (hard fork)
   Title: Dynamically Controlled Bitcoin Block Size Max Cap
   Author: Upal Chakraborty <bitcoin@upalc.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0106
   Status: Draft
   Type: Standards Track
   Created: 2015-08-24
diff --git a/bip-0107.mediawiki b/bip-0107.mediawiki
index 86edd995..84cd6a62 100644
--- a/bip-0107.mediawiki
+++ b/bip-0107.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 107
+  Layer: Consensus (hard fork)
   Title: Dynamic limit on the block size
   Author: Washington Y. Sanchez <washington.sanchez@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0107
   Status: Draft
   Type: Standards Track
   Created: 2015-09-11
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0109.mediawiki b/bip-0109.mediawiki
index bd37489c..69b265b1 100644
--- a/bip-0109.mediawiki
+++ b/bip-0109.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 109
+  Layer: Consensus (hard fork)
   Title: Two million byte size limit with sigop and sighash limits
   Author: Gavin Andresen <gavinandresen@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0109
   Status: Rejected
   Type: Standards Track
   Created: 2016-01-28
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0111.mediawiki b/bip-0111.mediawiki
index 45578329..cb5028f5 100644
--- a/bip-0111.mediawiki
+++ b/bip-0111.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 111
+  Layer: Peer Services
   Title: NODE_BLOOM service bit
   Author: Matt Corallo <bip111@bluematt.me>
           Peter Todd <pete@petertodd.org>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0111
+  Status: Proposed
   Type: Standards Track
   Created: 2015-08-20
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0112.mediawiki b/bip-0112.mediawiki
index 40378ee7..65171a4b 100644
--- a/bip-0112.mediawiki
+++ b/bip-0112.mediawiki
@@ -1,12 +1,16 @@
 <pre>
   BIP: 112
+  Layer: Consensus (soft fork)
   Title: CHECKSEQUENCEVERIFY
   Author: BtcDrak <btcdrak@gmail.com>
           Mark Friedenbach <mark@friedenbach.org>
           Eric Lombrozo <elombrozo@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0112
   Status: Final
   Type: Standards Track
   Created: 2015-08-10
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0113.mediawiki b/bip-0113.mediawiki
index 1c402aa0..36867771 100644
--- a/bip-0113.mediawiki
+++ b/bip-0113.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 113
+  Layer: Consensus (soft fork)
   Title: Median time-past as endpoint for lock-time calculations
   Author: Thomas Kerin <me@thomaskerin.io>
           Mark Friedenbach <mark@friedenbach.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0113
   Status: Final
   Type: Standards Track
   Created: 2015-08-10
+  License: PD
 </pre>
 
 
diff --git a/bip-0114.mediawiki b/bip-0114.mediawiki
index cb9aea7c..21d0b6cc 100644
--- a/bip-0114.mediawiki
+++ b/bip-0114.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 114
+  Layer: Consensus (soft fork)
   Title: Merkelized Abstract Syntax Tree
   Author: Johnson Lau <jl2012@xbt.hk>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0114
   Status: Draft
   Type: Standards Track
   Created: 2016-04-02
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0120.mediawiki b/bip-0120.mediawiki
index 1602c655..d48cdfac 100644
--- a/bip-0120.mediawiki
+++ b/bip-0120.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 120
+  Layer: Applications
   Title: Proof of Payment
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0120
   Status: Draft
   Type: Standards Track
   Created: 2015-07-28
diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index bafe8564..34820f5f 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -1,7 +1,10 @@
 <pre>
   BIP: 121
+  Layer: Applications
   Title: Proof of Payment URI scheme
   Author: Kalle Rosenbaum <kalle@rosenbaum.se>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0121
   Status: Draft
   Type: Standards Track
   Created: 2015-07-27
diff --git a/bip-0122.mediawiki b/bip-0122.mediawiki
index 5386dd27..3fb5df87 100644
--- a/bip-0122.mediawiki
+++ b/bip-0122.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 122
+  Layer: Applications
   Title: URI scheme for Blockchain references / exploration
   Author: Marco Pontello <marcopon@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0122
   Status: Draft
   Type: Standards Track
   Created: 2015-08-29
+  License: PD
   Post-History: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-August/010712.html
 </pre>
 
diff --git a/bip-0123.mediawiki b/bip-0123.mediawiki
index 3005f012..d438322a 100644
--- a/bip-0123.mediawiki
+++ b/bip-0123.mediawiki
@@ -2,7 +2,9 @@
   BIP: 123
   Title: BIP Classification
   Author: Eric Lombrozo <elombrozo@gmail.com>
-  Status: Draft
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0123
+  Status: Active
   Type: Process
   Created: 2015-08-26
 </pre>
diff --git a/bip-0124.mediawiki b/bip-0124.mediawiki
index 2f9f4ad7..a5929ac0 100644
--- a/bip-0124.mediawiki
+++ b/bip-0124.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 124
+  Layer: Applications
   Title: Hierarchical Deterministic Script Templates
   Author: Eric Lombrozo <eric@ciphrex.com>
           William Swanson <swansontec@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0124
   Status: Draft
   Type: Informational
   Created: 2015-11-20
+  License: PD
   Post-History: http://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-November/011795.html
 </pre>
 
diff --git a/bip-0125.mediawiki b/bip-0125.mediawiki
index 52dfe404..a4b0279c 100644
--- a/bip-0125.mediawiki
+++ b/bip-0125.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 125
+  Layer: Applications
   Title: Opt-in Full Replace-by-Fee Signaling
   Author: David A. Harding <dave@dtrt.org>
           Peter Todd <pete@petertodd.org>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0125
+  Status: Proposed
   Type: Standards Track
   Created: 2015-12-04
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0126.mediawiki b/bip-0126.mediawiki
index 43722d0d..f498b1cb 100644
--- a/bip-0126.mediawiki
+++ b/bip-0126.mediawiki
@@ -2,9 +2,12 @@
   BIP: 126
   Title: Best Practices for Heterogeneous Input Script Transactions
   Author: Kristov Atlas <kristov@openbitcoinprivacyproject.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0126
   Status: Draft
   Type: Informational
   Created: 2016-02-10
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0130.mediawiki b/bip-0130.mediawiki
index ae1e602a..8d96c0c8 100644
--- a/bip-0130.mediawiki
+++ b/bip-0130.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 130
+  Layer: Peer Services
   Title: sendheaders message
   Author: Suhas Daftuar <sdaftuar@chaincode.com>
-  Status: Accepted
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0130
+  Status: Proposed
   Type: Standards Track
   Created: 2015-05-08
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0131.mediawiki b/bip-0131.mediawiki
index 1efe7133..5938138b 100644
--- a/bip-0131.mediawiki
+++ b/bip-0131.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 131
+  Layer: Consensus (hard fork)
   Title: "Coalescing Transaction" Specification (wildcard inputs)
   Author: Chris Priest <cp368202@ohiou.edu>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0131
   Status: Draft
   Type: Standards Track
   Created: 2015-11-30
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0132.mediawiki b/bip-0132.mediawiki
index 03cc8349..e7aed292 100644
--- a/bip-0132.mediawiki
+++ b/bip-0132.mediawiki
@@ -2,9 +2,12 @@
   BIP: 132
   Title: Committee-based BIP Acceptance Process
   Author: Andy Chase <theandychase@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0132
   Status: Withdrawn
   Type: Process
   Created: 2015-08-31
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0133.mediawiki b/bip-0133.mediawiki
index 7d98f87c..c109f12f 100644
--- a/bip-0133.mediawiki
+++ b/bip-0133.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 133
+  Layer: Peer Services
   Title: feefilter message
   Author: Alex Morcos <morcos@chaincode.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0133
   Status: Draft
   Type: Standards Track
   Created: 2016-02-13
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0134.mediawiki b/bip-0134.mediawiki
index fa2103bd..9adc8b54 100644
--- a/bip-0134.mediawiki
+++ b/bip-0134.mediawiki
@@ -1,10 +1,15 @@
 <pre>
   BIP: 134
+  Layer: Consensus (hard fork)
   Title: Flexible Transactions
   Author: Tom Zander <tomz@freedommail.ch>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0134
   Status: Draft
   Type: Standards Track
   Created: 2016-07-27
+  License: CC-BY-SA-4.0
+           OPL
 </pre>
 
 ==Abstract==
diff --git a/bip-0140.mediawiki b/bip-0140.mediawiki
index b187a49b..ea5061fe 100644
--- a/bip-0140.mediawiki
+++ b/bip-0140.mediawiki
@@ -1,11 +1,16 @@
 <pre>
   BIP: 140
+  Layer: Consensus (soft fork)
   Title: Normalized TXID
   Author: Christian Decker <decker.christian@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0140
   Status: Draft
   Type: Standards Track
   Created: 2015-10-14
+  License: PD
 </pre>
+
 == Abstract ==
 
 This BIP describes the use of normalized transaction IDs (NTXIDs) in order to eliminate transaction malleability, both in the third-party modification scenario as well as the participant modification scenario. The transaction ID is normalized by removing the signature scripts from transactions before computing its hash. The normalized transaction hashes are then used during the signature creation and signature verification of dependent transactions.
@@ -110,4 +115,4 @@ This is a softfork which replaces <code>OP_NOP4</code> with the new implementati
 <references>
 
 ==Copyright==
-This document is placed in the public domain.
\ No newline at end of file
+This document is placed in the public domain.
diff --git a/bip-0141.mediawiki b/bip-0141.mediawiki
index 352256f7..7cc587a2 100644
--- a/bip-0141.mediawiki
+++ b/bip-0141.mediawiki
@@ -1,12 +1,16 @@
 <pre>
   BIP: 141
+  Layer: Consensus (soft fork)
   Title: Segregated Witness (Consensus layer)
   Author: Eric Lombrozo <elombrozo@gmail.com>
           Johnson Lau <jl2012@xbt.hk>
           Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0141
   Status: Draft
   Type: Standards Track
   Created: 2015-12-21
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0142.mediawiki b/bip-0142.mediawiki
index bb602653..80a413f2 100644
--- a/bip-0142.mediawiki
+++ b/bip-0142.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 142
+  Layer: Applications
   Title: Address Format for Segregated Witness
   Author: Johnson Lau <jl2012@xbt.hk>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0142
   Status: Deferred
   Type: Standards Track
   Created: 2015-12-24
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0143.mediawiki b/bip-0143.mediawiki
index 766fd9f2..476b84da 100644
--- a/bip-0143.mediawiki
+++ b/bip-0143.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 143
+  Layer: Consensus (soft fork)
   Title: Transaction Signature Verification for Version 0 Witness Program
   Author: Johnson Lau <jl2012@xbt.hk>
           Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0143
   Status: Draft
   Type: Standards Track
   Created: 2016-01-03
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0144.mediawiki b/bip-0144.mediawiki
index f10fe0cd..8e65554c 100644
--- a/bip-0144.mediawiki
+++ b/bip-0144.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 144
+  Layer: Peer Services
   Title: Segregated Witness (Peer Services)
   Author: Eric Lombrozo <elombrozo@gmail.com>
           Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0144
   Status: Draft
   Type: Standards Track
   Created: 2016-01-08
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0145.mediawiki b/bip-0145.mediawiki
index cac838df..a7ace987 100644
--- a/bip-0145.mediawiki
+++ b/bip-0145.mediawiki
@@ -1,10 +1,15 @@
 <pre>
   BIP: 145
+  Layer: API/RPC
   Title: getblocktemplate Updates for Segregated Witness
   Author: Luke Dashjr <luke+bip22@dashjr.org>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0145
   Status: Draft
   Type: Standards Track
   Created: 2016-01-30
+  License: BSD-2-Clause
+           OPL
 </pre>
 
 ==Abstract==
diff --git a/bip-0146.mediawiki b/bip-0146.mediawiki
index 5358411a..240f82a0 100644
--- a/bip-0146.mediawiki
+++ b/bip-0146.mediawiki
@@ -1,11 +1,15 @@
 <pre>
   BIP: 146
+  Layer: Consensus (soft fork)
   Title: Dealing with signature encoding malleability
   Author: Johnson Lau <jl2012@xbt.hk>
           Pieter Wuille <pieter.wuille@gmail.com>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0146
   Status: Draft
   Type: Standards Track
   Created: 2016-08-16
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0147.mediawiki b/bip-0147.mediawiki
index 001abc65..8a5c67ac 100644
--- a/bip-0147.mediawiki
+++ b/bip-0147.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 147
+  Layer: Consensus (soft fork)
   Title: Dealing with dummy stack element malleability
   Author: Johnson Lau <jl2012@xbt.hk>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0147
   Status: Draft
   Type: Standards Track
   Created: 2016-09-02
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/bip-0150.mediawiki b/bip-0150.mediawiki
index b1d46c1b..e3f74f52 100644
--- a/bip-0150.mediawiki
+++ b/bip-0150.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 150
+  Layer: Peer Services
   Title: Peer Authentication
   Author: Jonas Schnelli <dev@jonasschnelli.ch>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0150
   Status: Draft
   Type: Standards Track
   Created: 2016-03-23
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0151.mediawiki b/bip-0151.mediawiki
index cf221f24..228f66dc 100644
--- a/bip-0151.mediawiki
+++ b/bip-0151.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 151
+  Layer: Peer Services
   Title: Peer-to-Peer Communication Encryption
   Author: Jonas Schnelli <dev@jonasschnelli.ch>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0151
   Status: Draft
   Type: Standards Track
   Created: 2016-03-23
+  License: PD
 </pre>
 
 == Abstract ==
diff --git a/bip-0152.mediawiki b/bip-0152.mediawiki
index 109bbb3e..e7177400 100644
--- a/bip-0152.mediawiki
+++ b/bip-0152.mediawiki
@@ -1,10 +1,14 @@
 <pre>
   BIP: 152
+  Layer: Peer Services
   Title: Compact Block Relay
   Author: Matt Corallo <bip152@bluematt.me>
+  Comments-Summary: No comments yet.
+  Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0152
   Status: Draft
   Type: Standards Track
   Created: 2016-04-27
+  License: PD
 </pre>
 
 ==Abstract==
diff --git a/scripts/buildtable.pl b/scripts/buildtable.pl
index d8f52f2a..fb49c67b 100755
--- a/scripts/buildtable.pl
+++ b/scripts/buildtable.pl
@@ -3,17 +3,23 @@ use strict;
 use warnings;
 
 my $topbip = 9999;
+my $include_layer = 0;
 
 my %RequiredFields = (
 	BIP => undef,
 	Title => undef,
 	Author => undef,
+	'Comments-Summary' => undef,
+	'Comments-URI' => undef,
 	Status => undef,
 	Type => undef,
 	Created => undef,
+	# License => undef,   (has exceptions)
 );
 my %MayHaveMulti = (
 	Author => undef,
+	'Comments-URI' => undef,
+	License => undef,
 	'Post-History' => undef,
 );
 my %DateField = (
@@ -24,17 +30,24 @@ my %EmailField = (
 	Editor => undef,
 );
 my %MiscField = (
+	'Comments-Summary' => undef,
 	'Discussions-To' => undef,
 	'Post-History' => undef,
 	'Replaces' => undef,
 	'Superseded-By' => undef,
-	'Resolution' => undef,
 );
 
+my %ValidLayer = (
+	'Consensus (soft fork)' => undef,
+	'Consensus (hard fork)' => undef,
+	'Peer Services' => undef,
+	'API/RPC' => undef,
+	'Applications' => undef,
+);
 my %ValidStatus = (
 	Draft => undef,
 	Deferred => undef,
-	Accepted => "background-color: #ffffcf",
+	Proposed => "background-color: #ffffcf",
 	Rejected => "background-color: #ffcfcf",
 	Withdrawn => "background-color: #ffcfcf",
 	Final => "background-color: #cfffcf",
@@ -46,6 +59,34 @@ my %ValidType = (
 	'Informational' => undef,
 	'Process' => undef,
 );
+my %RecommendedLicenses = (
+	'BSD-2-Clause' => undef,
+	'BSD-3-Clause' => undef,
+	'CC0-1.0' => undef,
+	'GNU-All-Permissive' => undef,
+);
+my %AcceptableLicenses = (
+	%RecommendedLicenses,
+	'Apache-2.0' => undef,
+	'BSL-1.0' => undef,
+	'CC-BY-4.0' => undef,
+	'CC-BY-SA-4.0' => undef,
+	'MIT' => undef,
+	'AGPL-3.0' => undef,
+	'AGPL-3.0+' => undef,
+	'FDL-1.3' => undef,
+	'GPL-2.0' => undef,
+	'GPL-2.0+' => undef,
+	'LGPL-2.1' => undef,
+	'LGPL-2.1+' => undef,
+);
+my %DefinedLicenses = (
+	%AcceptableLicenses,
+	'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 %TolerateMissingLicense = map { $_ => undef } qw(1 10 11 12 13 14 15 16 21 30 31 32 33 34 35 39 43 44 45 47 61 62 64 66 68 70 71 72 73 75 101 102 103 106 120 121 123);
 
 my %emails;
 
@@ -58,7 +99,7 @@ while (++$bipnum <= $topbip) {
 			die "No <pre> in $fn" if eof $F;
 	}
 	my %found;
-	my ($title, $author, $status, $type);
+	my ($title, $author, $status, $type, $layer);
 	my ($field, $val);
 	while (<$F>) {
 		m[^</pre>$] && last;
@@ -74,7 +115,6 @@ while (++$bipnum <= $topbip) {
 		} else {
 			die "Bad line in $fn preamble";
 		}
-		++$found{$field};
 		die "Extra spaces in $fn" if $val =~ /^\s/;
 		if ($field eq 'BIP') {
 			die "$fn claims to be BIP $val" if $val ne $bipnum;
@@ -103,6 +143,18 @@ while (++$bipnum <= $topbip) {
 			} else {
 				$type = $val;
 			}
+		} elsif ($field eq 'Layer') {  # BIP 123
+			die "Invalid layer $val in $fn" unless exists $ValidLayer{$val};
+			$layer = $val;
+		} elsif ($field eq 'License') {
+			die "Undefined license $val in $fn" unless exists $DefinedLicenses{$val};
+			if (not $found{License}) {
+				die "Unacceptable license $val in $fn" unless exists $AcceptableLicenses{$val} or ($val eq 'PD' and exists $GrandfatheredPD{$bipnum});
+			}
+		} elsif ($field eq 'Comments-URI') {
+			if (not $found{'Comments-URI'}) {
+				die unless $val eq sprintf('https://github.com/bitcoin/bips/wiki/Comments:BIP-%04d', $bipnum);
+			}
 		} elsif (exists $DateField{$field}) {
 			die "Invalid date format in $fn" unless $val =~ /^20\d{2}\-(?:0\d|1[012])\-(?:[012]\d|30|31)$/;
 		} elsif (exists $EmailField{$field}) {
@@ -110,6 +162,10 @@ while (++$bipnum <= $topbip) {
 		} elsif (not exists $MiscField{$field}) {
 			die "Unknown field $field in $fn";
 		}
+		++$found{$field};
+	}
+	if (not $found{License}) {
+		die "Missing License in $fn" unless exists $TolerateMissingLicense{$bipnum};
 	}
 	for my $field (keys %RequiredFields) {
 		die "Missing $field in $fn" unless $found{$field};
@@ -120,6 +176,13 @@ while (++$bipnum <= $topbip) {
 	}
 	print "\n";
 	print "| [[${fn}|${bipnum}]]\n";
+	if ($include_layer) {
+		if (defined $layer) {
+			print "| ${layer}\n";
+		} else {
+			print "|\n";
+		}
+	}
 	print "| ${title}\n";
 	print "| ${author}\n";
 	print "| ${type}\n";