diff --git a/ChangeLog b/ChangeLog
index a7143f9087..303b5f4a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 28 14:30:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
+	  correctly. Patch by Gabriele Giacone (1o5g4r8o@gmail.com).
+	* test/fiddle/helper.rb: ditto.
+
 Sat Sep 28 00:19:41 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* ext/curses/extconf.rb: check the size of chtype.
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index b195719866..a07056d142 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -33,6 +33,9 @@ when /darwin/
 when /kfreebsd/
   libc_so = "/lib/libc.so.0.1"
   libm_so = "/lib/libm.so.1"
+when /gnu/	#GNU/Hurd
+  libc_so = "/lib/libc.so.0.3"
+  libm_so = "/lib/libm.so.6"
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index 303bec05b6..404c137f97 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -34,6 +34,9 @@ when /darwin/
 when /kfreebsd/
   libc_so = "/lib/libc.so.0.1"
   libm_so = "/lib/libm.so.1"
+when /gnu/	#GNU/Hurd
+  libc_so = "/lib/libc.so.0.3"
+  libm_so = "/lib/libm.so.6"
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"