diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index bfc9649..991e063 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -30,7 +30,7 @@ module EventsHelper
         # the day itself
         date,
         # is there any events in this date?
-        events.any? {|event| event.date_range.include?(date)},
+        events.any? {|event| event.date_range.cover?(date)},
         # is this date in the current month?
         true
       ]
diff --git a/app/models/category.rb b/app/models/category.rb
index 655c4f5..93d56b8 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -81,7 +81,7 @@ class Category < ActiveRecord::Base
   end
 
   def upcoming_events(limit = 10)
-    self.events.paginate(:conditions => [ 'start_date >= ?', Date.today ], :order => 'start_date', :page => 1, :per_page => limit)
+    self.events.paginate(:conditions => [ 'start_date >= ?', DateTime.now.beginning_of_day ], :order => 'start_date', :page => 1, :per_page => limit)
   end
 
   def display_in_menu?
diff --git a/features/events.feature b/features/events.feature
index 6156458..2c9e25e 100644
--- a/features/events.feature
+++ b/features/events.feature
@@ -223,7 +223,7 @@ Feature: events
       | owner     | name         | start_date | end_date   |
       | josesilva | WikiSym 2009 | 2009-10-25 | 2009-10-27 |
     When I am on /profile/josesilva/events/2009/10/26
-    Then I should see "October 25, 2009 to October 27, 2009"
+    Then I should see "October 25, 2009 0:00 to October 27, 2009 0:00"
 
   Scenario: show place of the event
     Given I am on /profile/josesilva/events/2009/10
--
libgit2 0.21.2