diff --git a/EIPS/eip-158.md b/EIPS/eip-158.md
index 0fee2ffa..a0241b65 100644
--- a/EIPS/eip-158.md
+++ b/EIPS/eip-158.md
@@ -1,4 +1,13 @@
-EDITOR NOTE: below is a copy of the EIP 158 https://github.com/ethereum/EIPs/issues/158#issue-183264659 raw text fetched on 2017-06-23.
+```
+EIP: 158
+Title: State clearing
+Author: Vitalik Buterin
+Type: Standard Track
+Category: Core
+Status: Superseded
+Created: 2016-10-16
+Superseded-By: 161
+```
 
 # Specification
 
diff --git a/EIPS/eip-161.md b/EIPS/eip-161.md
index 8d6e93db..c65eb37d 100644
--- a/EIPS/eip-161.md
+++ b/EIPS/eip-161.md
@@ -1,4 +1,12 @@
-EDITOR NOTE: below is a copy of the EIP 161 https://github.com/ethereum/EIPs/issues/161#issue-184805822 raw text fetched on 2017-06-23.
+```
+EIP: 161
+Title: State trie clearing (invariant-preserving alternative)
+Author: Gavin Wood
+Type: Standard Track
+Category: Core
+Status: Final
+Created: 2016-10-24
+```
 
 # Specification