diff --git a/lib/slug.rb b/lib/slug.rb
index 89e18a9051f..39afd86f6af 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -6,7 +6,7 @@
 module Slug
 
   def self.for(string)
-    string.parameterize
+    string.parameterize.gsub("_", "-")
   end
 
 end
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index 1ed7c4180c7..ec4509b1029 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -39,5 +39,9 @@ describe Slug do
     Slug.for(from).should == to
   end
 
+  it 'replaces underscores' do
+    Slug.for("o_o_o").should == "o-o-o"
+  end
+
 end