diff --git a/ChangeLog b/ChangeLog
index c62bf8d870..eb2cf2ef67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 12 14:28:01 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/mkexports.rb (each_export): skip garbages generated by VS2012's
+	  nmake.
+	  reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
+
 Sun Nov 11 18:58:55 2012  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* test/date/test_date_{parse,strptime}.rb: changed the format of
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 62d48cfce1..ab29fc1cfa 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -115,7 +115,7 @@ class Exports::Mswin < Exports
           next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '')
           is_data = !$1
           if noprefix or /^[@_]/ =~ l
-            next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l ||
+            next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,32}$/ =~ l ||
               /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l
             l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
           elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')