diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index 969b77dd..d82ec310 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -7,9 +7,7 @@ class ConferenceController < ApplicationController
     @antiquated = @conferences - @current
   end
 
-  def show
-    @keynote_speakers = @conference.keynote_speakers
-  end
+  def show; end
 
   def gallery_photos
     @photos = @conference.photos
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 14e0a6e4..1f6088fd 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -558,8 +558,8 @@ class Conference < ActiveRecord::Base
     email_settings.updated_conference_registration_dates_template
   end
 
-  def keynote_speakers
-    User.with_role(:keynote_speaker, self)
+  def keynotes
+    events.where(state: 'confirmed').select { |e| e.event_type.title == 'Keynote'}
   end
 
   ##
@@ -902,6 +902,9 @@ class Conference < ActiveRecord::Base
     event_types << EventType.create(title: 'Workshop', length: 60, color: '#0000FF',
                                     minimum_abstract_length: 0,
                                     maximum_abstract_length: 500)
+    event_types << EventType.create(title: 'Keynote', length: 60, color: '#00FF00',
+                                    minimum_abstract_length: 0,
+                                    maximum_abstract_length: 500)
     true
   end
 
diff --git a/app/views/admin/event_types/index.html.haml b/app/views/admin/event_types/index.html.haml
index 6a9326a1..fddc2dd3 100644
--- a/app/views/admin/event_types/index.html.haml
+++ b/app/views/admin/event_types/index.html.haml
@@ -22,7 +22,7 @@
               = event_type.length
               Minutes
             %td
-              = "#{event_type.minimum_abstract_length}:#{event_type.maximum_abstract_length}"
+              = "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
               Words
             %td
               %span.label{style: "background-color: #{event_type.color};"}
diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml
index 288d83f7..95868464 100644
--- a/app/views/conference/_program.html.haml
+++ b/app/views/conference/_program.html.haml
@@ -24,10 +24,27 @@
           = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
-  - #FIXME: Display keynotes https://github.com/openSUSE/osem/issues/544
+  - if @conference.keynotes.any?
+    .row
+      .col-md12
+        %h3.text-center
+          Keynote Talks!
+    .row
+      .col-md-12
+        - @conference.keynotes.each_slice(3) do |slice|
+          .row.row-centered
+            - slice.each do |event|
+              .col-md-6.col-centered
+                .thumbnail
+                  %p.text-center
+                    %b= event.title
+                  %h5.text-center
+                    = simple_format truncate(event.abstract, length: 500, separator: ' ')
+                    = link_to "Read More", conference_proposal_path(@conference.short_title, event)
 
   %h3.text-center
     Don't miss out!
+  %br
   - if @conference.highlights.any?
     .row
       .col-md-12