diff --git a/lib/sup.rb b/lib/sup.rb
index e90c971d5..209ddea99 100644
--- a/lib/sup.rb
+++ b/lib/sup.rb
@@ -26,7 +26,7 @@ def yaml_properties *props
     props = props.map { |p| p.to_s }
 
     path = name.gsub(/::/, "/")
-    yaml_tag "!#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
+    yaml_tag "tag:#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
 
     define_method :init_with do |coder|
       initialize(*coder.map.values_at(*props))
diff --git a/lib/sup/util/locale_fiddler.rb b/lib/sup/util/locale_fiddler.rb
index 38d0e1ab6..20fc26af7 100644
--- a/lib/sup/util/locale_fiddler.rb
+++ b/lib/sup/util/locale_fiddler.rb
@@ -11,6 +11,7 @@ module LocaleFiddler
   SETLOCALE_LIB = case RbConfig::CONFIG['arch']
                   when /darwin/; "libc.dylib"
                   when /cygwin/; "cygwin1.dll"
+                  when /msys/; "msys-2.0.dll"
                   when /freebsd/; "libc.so.7"
                   else; "libc.so.6"
                   end