diff --git a/app/models/event.rb b/app/models/event.rb
index 7bb8afb..557ed84 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -111,7 +111,7 @@ class Event < Article
   end
 
   def duration
-    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24)
+    (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) + 1
   end
 
   alias_method :article_lead, :lead
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
index 658f56f..2666c1c 100644
--- a/test/unit/event_test.rb
+++ b/test/unit/event_test.rb
@@ -323,4 +323,14 @@ class EventTest < ActiveSupport::TestCase
     assert a.can_display_media_panel?
   end
 
+  should 'calculate duration of events with start and end date' do
+    e = build(Event, :start_date => DateTime.new(2015, 1, 1), :end_date => DateTime.new(2015, 1, 5))
+    assert_equal 5, e.duration
+  end
+
+  should 'calculate duration of event with only start_date' do
+    e = build(Event, :start_date => DateTime.new(2015, 1, 1))
+    assert_equal 1, e.duration
+  end
+
 end
--
libgit2 0.21.2