diff --git a/index.html b/index.html
index 80d236b..8686c35 100644
--- a/index.html
+++ b/index.html
@@ -29,22 +29,22 @@
         specStatus: "ED",
         copyrightStart: "2015",
         editors: [
-          { name: "Chris Wilson",
-            url: "mailto:cwilso@google.com",
-            w3cid: "3742",
-            company: "Google",
-            companyURL: "http://google.com"
-          },
           { name: "Michael Wilson",
             url: "mailto:mjwilson@google.com",
             w3cid: "136815",
             company: "Google",
-            companyURL: "http://google.com"
+            companyURL: "https://www.google.com"
           },
         ],
         formerEditors: [
+          { name: "Chris Wilson",
+            url: "https://github.com/cwilso",
+            w3cid: "3742",
+            company: "Google",
+            companyURL: "https://www.google.com"
+          },
           { name: "Jussi Kalliokoski",
-            url: "http://juss.in",
+            url: "https://github.com/jussi-kalliokoski",
             w3cid: "45545"
           },
         ],