diff --git a/Rakefile b/Rakefile
index a9a16878..411c9aac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,7 @@ end
 file 'lib/linguist/classifier.yml' => Dir['samples/**/*'] do |f|
   require 'linguist/sample'
   classifier = Linguist::Sample.classifier
-  File.open(f.name, 'w') { |io| YAML.dump(classifier, io) }
+  File.open(f.name, 'w') { |io| classifier.to_yaml(io) }
 end
 
 CLOBBER.include 'lib/linguist/classifier.yml'
diff --git a/lib/linguist/classifier.rb b/lib/linguist/classifier.rb
index 30fb7c49..d1397059 100644
--- a/lib/linguist/classifier.rb
+++ b/lib/linguist/classifier.rb
@@ -170,7 +170,7 @@ module Linguist
       @tokens.sort.each do |language, tokens|
         data << "  #{{language => true}.to_yaml.lines.to_a[1].sub(/ true/, "")}"
         tokens.sort.each do |token, count|
-          data << "    #{{token => count}.to_yaml.lines.to_a[1]}"
+          data << "    #{{token => count}.to_yaml.lines.to_a[1].sub(/! /, "")}"
         end
       end