diff --git a/content/fahrplan.de.md b/content/fahrplan.de.md
index 037641d..d278447 100644
--- a/content/fahrplan.de.md
+++ b/content/fahrplan.de.md
@@ -9,8 +9,7 @@ menu:
 
 ## Fahrplan {{< cosin "date_year" >}}
 
-Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
-
+{{< schedule >}}
 
 ## Ältere Fahrpläne
 
diff --git a/content/fahrplan.en.md b/content/fahrplan.en.md
index 55b6036..59aca69 100644
--- a/content/fahrplan.en.md
+++ b/content/fahrplan.en.md
@@ -9,8 +9,7 @@ menu:
 
 ## Schedule {{< cosin "date_year" >}}
 
-Schedule of this year's CoSin will be online in early June.
-
+{{< schedule >}}
 
 ## Older schedules
 
diff --git a/content/fahrplan.fr.md b/content/fahrplan.fr.md
index 45c9035..a03382c 100644
--- a/content/fahrplan.fr.md
+++ b/content/fahrplan.fr.md
@@ -9,8 +9,7 @@ menu:
 
 ## Programme {{< cosin "date_year" >}}
 
-Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
-
+{{< schedule >}}
 
 ## Anciens programmes
 
diff --git a/content/fahrplan.it.md b/content/fahrplan.it.md
index 244c64b..9e4992c 100644
--- a/content/fahrplan.it.md
+++ b/content/fahrplan.it.md
@@ -9,8 +9,7 @@ menu:
 
 ## Tabella di marcia {{< cosin "date_year" >}}
 
-Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
-
+{{< schedule >}}
 
 ## Tabelle di marcia precedenti
 
diff --git a/content/ort.en.md b/content/ort.en.md
index d41c0a1..69b9c6a 100644
--- a/content/ort.en.md
+++ b/content/ort.en.md
@@ -23,7 +23,7 @@ This year's CoSin takes place in the [{{< cosin "location_name" >}}][1] in {{< c
 
 ## Getting there
 
-* Address: Faubourd du Jura 36, 2502 Biel/Bienne
+* Address: Faubourg du Jura 36, 2502 Biel/Bienne
 * [OpenStreetMap][2]
 * The railway station is approximately a 15-minute walk away
 * Parking spaces are available
diff --git a/data/cosin.toml b/data/cosin.toml
index b225962..62316a3 100644
--- a/data/cosin.toml
+++ b/data/cosin.toml
@@ -37,7 +37,8 @@ cfp_url = "https://frab.ccczh.ch/en/cosin/cfp/session/new"
 
 
 schedule_available = true
-schedule_urls = [
+schedule_main_url = "https://www.cosin.ch/fahrplan/2017/index.html"
+schedule_day_urls = [
   "https://www.cosin.ch/fahrplan/2017/schedule/1.html",
   "https://www.cosin.ch/fahrplan/2017/schedule/2.html",
   "https://www.cosin.ch/fahrplan/2017/schedule/3.html"]
diff --git a/layouts/shortcodes/schedule.html b/layouts/shortcodes/schedule.html
new file mode 100644
index 0000000..95f81fc
--- /dev/null
+++ b/layouts/shortcodes/schedule.html
@@ -0,0 +1,9 @@
+{{ if eq .Site.Language.Lang "de" }}
+  {{ partial "fahrplan.de.html" . }}
+{{ else if eq .Site.Language.Lang "fr" }}
+  {{ partial "fahrplan.fr.html" . }}
+{{ else if eq .Site.Language.Lang "it" }}
+  {{ partial "fahrplan.it.html" . }}
+{{ else if eq .Site.Language.Lang "en" }}
+  {{ partial "fahrplan.en.html" . }}
+{{ end }}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.de.html b/themes/cosin-theme/layouts/partials/fahrplan.de.html
new file mode 100644
index 0000000..f33cc50
--- /dev/null
+++ b/themes/cosin-theme/layouts/partials/fahrplan.de.html
@@ -0,0 +1,12 @@
+{{ if .Site.Data.cosin.schedule_available }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin ist da!
+  </p>
+  <ul>
+    <li><a href="{{ .Site.Data.cosin.date_year | safeURL }}">CoSin {{ .Site.Data.cosin.date_year }}</a></li>
+  </ul>
+{{ else }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
+  </p>
+{{ end}}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.en.html b/themes/cosin-theme/layouts/partials/fahrplan.en.html
new file mode 100644
index 0000000..c7f902d
--- /dev/null
+++ b/themes/cosin-theme/layouts/partials/fahrplan.en.html
@@ -0,0 +1,12 @@
+{{ if .Site.Data.cosin.schedule_available }}
+  <p>
+    Schedule of this year's CoSin is ready!
+  </p>
+  <ul>
+    <li><a href="{{ .Site.Data.cosin.date_year | safeURL }}">CoSin {{ .Site.Data.cosin.date_year }}</a></li>
+  </ul>
+{{ else }}
+  <p>
+    Schedule of this year's CoSin will be online in early June.
+  </p>
+{{ end}}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.fr.html b/themes/cosin-theme/layouts/partials/fahrplan.fr.html
new file mode 100644
index 0000000..f33cc50
--- /dev/null
+++ b/themes/cosin-theme/layouts/partials/fahrplan.fr.html
@@ -0,0 +1,12 @@
+{{ if .Site.Data.cosin.schedule_available }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin ist da!
+  </p>
+  <ul>
+    <li><a href="{{ .Site.Data.cosin.date_year | safeURL }}">CoSin {{ .Site.Data.cosin.date_year }}</a></li>
+  </ul>
+{{ else }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
+  </p>
+{{ end}}
diff --git a/themes/cosin-theme/layouts/partials/fahrplan.it.html b/themes/cosin-theme/layouts/partials/fahrplan.it.html
new file mode 100644
index 0000000..f33cc50
--- /dev/null
+++ b/themes/cosin-theme/layouts/partials/fahrplan.it.html
@@ -0,0 +1,12 @@
+{{ if .Site.Data.cosin.schedule_available }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin ist da!
+  </p>
+  <ul>
+    <li><a href="{{ .Site.Data.cosin.date_year | safeURL }}">CoSin {{ .Site.Data.cosin.date_year }}</a></li>
+  </ul>
+{{ else }}
+  <p>
+    Der Fahrplan für die diesjährige CoSin erscheint Anfang Juni.
+  </p>
+{{ end}}
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.de.html b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
index 5f9a60d..01b4674 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.de.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.de.html
@@ -41,7 +41,7 @@
 {{ if .schedule_available }}
 <p><strong>Fahrplan:</strong></p>
 <ul>
-  {{ range $index, $element := .schedule_urls }}
+  {{ range $index, $element := .schedule_day_urls }}
     <li><a href="{{ $element | safeURL }}">Tag {{ add $index 1 }}</a></li>
   {{ end }}
 </ul>
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.en.html b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
index 2b91031..e37d9ee 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.en.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.en.html
@@ -41,7 +41,7 @@
 {{ if .schedule_available }}
 <p><strong>Schedule:</strong></p>
 <ul>
-  {{ range $index, $element := .schedule_urls }}
+  {{ range $index, $element := .schedule_day_urls }}
     <li><a href="{{ $element | safeURL }}">Day {{ add $index 1 }}</a></li>
   {{ end }}
 </ul>
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
index 8c2bcab..0c32474 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.fr.html
@@ -41,7 +41,7 @@
 {{ if .schedule_available }}
 <p><strong>Programme:</strong></p>
 <ul>
-  {{ range $index, $element := .schedule_urls }}
+  {{ range $index, $element := .schedule_day_urls }}
     <li><a href="{{ $element | safeURL }}">Jour {{ add $index 1 }}</a></li>
   {{ end }}
 </ul>
diff --git a/themes/cosin-theme/layouts/partials/site-sidebar.it.html b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
index fac12f5..fd82e9b 100644
--- a/themes/cosin-theme/layouts/partials/site-sidebar.it.html
+++ b/themes/cosin-theme/layouts/partials/site-sidebar.it.html
@@ -41,7 +41,7 @@
 {{ if .schedule_available }}
 <p><strong>Tabella di marcia:</strong></p>
 <ul>
-  {{ range $index, $element := .schedule_urls }}
+  {{ range $index, $element := .schedule_day_urls }}
     <li><a href="{{ $element | safeURL }}">Giorno {{ add $index 1 }}</a></li>
   {{ end }}
 </ul>