diff --git a/src/keywords.js b/src/keywords.js
index d0c06e6..2ba61fb 100644
--- a/src/keywords.js
+++ b/src/keywords.js
@@ -18,6 +18,7 @@ module.exports = {
   REASON: "Reason",
   SSR: "Server Side Rendering",
   STATE_MANAGEMENT: "State management",
+  STATIC_SITE_GENERATATION: "Static site generation",
   STYLING: "Styling",
   STYLEGUIDIST: "Styleguidist",
   STYLE_GUIDES: "Style guides",
diff --git a/src/schedules/26-04-2018.js b/src/schedules/26-04-2018.js
index c0fa6ee..29bf4c1 100644
--- a/src/schedules/26-04-2018.js
+++ b/src/schedules/26-04-2018.js
@@ -19,9 +19,14 @@ module.exports = {
     },
     {
       begin: "09:15",
-      end: "10:00",
+      end: "09:45",
       sessions: [require("../talks/ken-wheeler")],
     },
+    {
+      begin: "09:45",
+      end: "10:00",
+      sessions: [require("../talks/juho-vepsalainen")],
+    },
     {
       begin: "10:15",
       end: "10:45",
@@ -67,11 +72,6 @@ module.exports = {
       end: "16:30",
       sessions: [require("../talks/gant-laborde")],
     },
-    {
-      begin: "16:30",
-      end: "16:45",
-      sessions: [require("../coffee-breaks").find(o => o.day === day)],
-    },
     {
       begin: "16:45",
       end: "17:00",
diff --git a/src/talks/juho-vepsalainen.js b/src/talks/juho-vepsalainen.js
new file mode 100644
index 0000000..8fe823e
--- /dev/null
+++ b/src/talks/juho-vepsalainen.js
@@ -0,0 +1,11 @@
+const enums = require("../enums");
+const keywords = require("../keywords");
+const speaker = require("../speakers/juho-vepsalainen");
+
+module.exports = {
+  speakers: [speaker],
+  title: "Static Websites - The Final Frontier",
+  description: "What was it like to build sites in the 90s? What did we learn? And how to do it now?",
+  type: enums.LIGHTNING_TALK,
+  keywords: [keywords.REACT, keywords.STATIC_SITE_GENERATATION, keywords.WEBPACK],
+};