diff --git a/ChangeLog b/ChangeLog
index 48d0bf10c6..e9106c67d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  2 16:15:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln_find.c (dln_find_exe, dln_find_file): remove deprecated
+	  non-reentrant functions.
+
 Sun Jun  2 15:04:35 2013  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/cgi/util.rb, lib/erb.rb: Use String#b [Feature #8394] by znz
diff --git a/dln.h b/dln.h
index 713bf8b56f..762517113f 100644
--- a/dln.h
+++ b/dln.h
@@ -30,8 +30,6 @@
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
-DEPRECATED(char *dln_find_exe(const char*,const char*));
-DEPRECATED(char *dln_find_file(const char*,const char*));
 char *dln_find_exe_r(const char*,const char*,char*,size_t);
 char *dln_find_file_r(const char*,const char*,char*,size_t);
 
diff --git a/dln_find.c b/dln_find.c
index 06caceb80d..3160235b74 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -94,20 +94,6 @@ dln_find_file_r(const char *fname, const char *path, char *buf, size_t size)
     return dln_find_1(fname, path, buf, size, 0);
 }
 
-static char fbuf[MAXPATHLEN];
-
-char *
-dln_find_exe(const char *fname, const char *path)
-{
-    return dln_find_exe_r(fname, path, fbuf, sizeof(fbuf));
-}
-
-char *
-dln_find_file(const char *fname, const char *path)
-{
-    return dln_find_file_r(fname, path, fbuf, sizeof(fbuf));
-}
-
 static char *
 dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 	   int exe_flag /* non 0 if looking for executable. */)