diff --git a/lib/heathen/filename.rb b/lib/heathen/filename.rb
index 2544fe9..4a51b82 100644
--- a/lib/heathen/filename.rb
+++ b/lib/heathen/filename.rb
@@ -5,12 +5,23 @@ module Filename
     # Suggests a new file name base on the old one and the mime_type provided
     # @return [String] a new file name, with an appropriate extension
     def self.suggest(filename, mime_type)
+      mime_type = muck_mime_type(mime_type)
       ext = File.extname(filename)
       temp_file = filename[0..-(ext.length + 1)]
       ext = MIME::Types[mime_type].first.preferred_extension rescue 'txt' # FIXME use a saner extension
       "#{temp_file}.#{ext}"
     end
 
+    ## Changes weird mime types to saner ones...
+    def self.muck_mime_type(mime_type)
+      case mime_type
+      when 'text/x-c++', 'text/x-c'
+        'text/plain'
+      else
+        mime_type
+      end
+    end
+
     # Suggests a new file name base on the old one and the mime_type provided
     # The new file name will be positioned correctly in the new dir, so for
     # example: