diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bf4e2d5ba..203ad6d94 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -167,7 +167,12 @@ module ApplicationHelper
   
   def due_date_distance_in_words(date)
     if date
-      l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
+      if date == Date.today
+        l(:label_roadmap_due_today)
+      else
+        label = (date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in)
+        l(label, distance_of_date_in_words(Date.today, date))
+      end
     end
   end
 
diff --git a/app/models/version.rb b/app/models/version.rb
index 95e6ad5f6..4139b60fb 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -71,7 +71,7 @@ class Version < ActiveRecord::Base
   
   # Returns true if the version is completed: due date reached and no open issues
   def completed?
-    effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
+    effective_date && (effective_date < Date.today) && (open_issues_count == 0)
   end
 
   def behind_schedule?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3c2a8902b..5ab65f05d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -649,6 +649,7 @@ de:
   label_sort_lowest: Ans Ende
   label_roadmap: Roadmap
   label_roadmap_due_in: "Fällig in {{value}}"
+  label_roadmap_due_doday: "Fällig heute"
   label_roadmap_overdue: "{{value}} verspätet"
   label_roadmap_no_issues: Keine Tickets für diese Version
   label_search: Suche
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3b4b80258..4722d81b4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -636,6 +636,7 @@ en:
   label_sort_lower: Move down
   label_sort_lowest: Move to bottom
   label_roadmap: Roadmap
+  label_roadmap_due_today: "Due today"
   label_roadmap_due_in: "Due in {{value}}"
   label_roadmap_overdue: "{{value}} late"
   label_roadmap_no_issues: No issues for this version