diff --git a/app/models/issue.rb b/app/models/issue.rb
index d83b2ab..ad6a616 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -121,6 +121,11 @@ class Issue < ActiveRecord::Base
     if assigned_to.nil? && category && category.assigned_to
       self.assigned_to = category.assigned_to
     end
+    
+    # default due date based on version
+    if fixed_version && fixed_version.effective_date && fixed_version.effective_date > Date.today then
+      self.due_date = fixed_version.effective_date
+    end
   end
   
   def before_save