diff --git a/ChangeLog b/ChangeLog
index 163dba3a7f..bdcdbd25c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May  8 13:46:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/json/generator/depend: fix dependencies [Bug #8379]
+
+	* ext/json/parser/depend: ditto.
+
 Wed May  8 13:07:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 1a042a2501..82946d1097 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1 +1,5 @@
-generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
+generator.o: generator.c $(HDRS) $(ruby_headers) $(srcdir)/../fbuffer/fbuffer.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(hdrdir)/ruby/re.h \
+  $(hdrdir)/ruby/regex.h \
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index 498ffa964c..748b4213ae 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -1 +1,3 @@
-parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
+parser.o: parser.c parser.rl $(HDRS) $(ruby_headers) $(srcdir)/../fbuffer/fbuffer.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \