diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 24da00073..1954351e5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -328,6 +328,10 @@ module ApplicationHelper
     end
   end
 
+  def anchor(text)
+    text.to_s.gsub(' ', '_')
+  end
+
   def html_hours(text)
     text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>').html_safe
   end
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 9f150bd24..6fdf8ae75 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -9,7 +9,7 @@
 <% else %>
 <div id="roadmap">
 <% @versions.each do |version| %>
-    <h3 class="version"><%= tag 'a', :name => h(version.name) %><%= link_to_version version %></h3>
+    <h3 class="version"><%= tag 'a', :name => anchor(version.name) %><%= link_to_version version %></h3>
     <%= render :partial => 'versions/overview', :locals => {:version => version} %>
     <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
 
@@ -49,7 +49,7 @@
 
 <h3><%= l(:label_version_plural) %></h3>
 <% @versions.each do |version| %>
-<%= link_to format_version_name(version), "##{version.name}" %><br />
+<%= link_to format_version_name(version), :anchor => anchor(version.name) %><br />
 <% end %>
 <% end %>