diff --git a/ChangeLog b/ChangeLog
index fed7574c2e..eb3e4ee580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 30 16:11:52 2013  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* tool/make-snapshot: needs CXXFLAGS.  [ruby-core:59393][Bug #9320]
+
 Sun Dec 29 18:36:54 2013  Shota Fukumori  <her@sorah.jp>
 
 	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index a3a90f94d3..bacf54e556 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -227,6 +227,7 @@ def package(rev, destdir)
         f.puts "s,@ARCH_FLAG@,|#_!!_#|,g"
         f.puts "s,@CFLAGS@,|#_!!_#|,g"
         f.puts "s,@CPPFLAGS@,|#_!!_#|,g"
+        f.puts "s,@CXXFLAGS@,|#_!!_#|,g"
         f.puts "s,@LDFLAGS@,|#_!!_#|,g"
         f.puts "s,@DLDFLAGS@,|#_!!_#|,g"
         f.puts "s,@LIBEXT@,|#_!!_#|a,g"