diff --git a/app/models/version.rb b/app/models/version.rb
index f9395c5d9..183500485 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -23,7 +23,7 @@ class Version < ActiveRecord::Base
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
-  validates_length_of :name, :maximum => 30
+  validates_length_of :name, :maximum => 60
   validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
   
   def start_date
diff --git a/app/views/versions/_form.rhtml b/app/views/versions/_form.rhtml
index cd3afcccd..e18f912bf 100644
--- a/app/views/versions/_form.rhtml
+++ b/app/views/versions/_form.rhtml
@@ -1,7 +1,7 @@
 <%= error_messages_for 'version' %>
 
 <div class="box">
-<p><%= f.text_field :name, :size => 20, :required => true %></p>
+<p><%= f.text_field :name, :size => 60, :required => true %></p>
 <p><%= f.text_field :description, :size => 60 %></p>
 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
 <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
diff --git a/db/migrate/090_change_versions_name_limit.rb b/db/migrate/090_change_versions_name_limit.rb
new file mode 100644
index 000000000..276429727
--- /dev/null
+++ b/db/migrate/090_change_versions_name_limit.rb
@@ -0,0 +1,9 @@
+class ChangeVersionsNameLimit < ActiveRecord::Migration
+  def self.up
+    change_column :versions, :name, :string, :limit => nil
+  end
+
+  def self.down
+    change_column :versions, :name, :string, :limit => 30
+  end
+end