diff --git a/ChangeLog b/ChangeLog
index 83cc9a76f8..51406d4c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 17 23:51:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_eval_cmd): $SAFE=4 has been deprecated.
+
 Fri Jul 17 22:18:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_compile_each): use enum ruby_tag_type names.
diff --git a/vm_eval.c b/vm_eval.c
index d389a4acc8..ff4abf53ed 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1502,7 +1502,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
     volatile int safe = rb_safe_level();
 
     if (OBJ_TAINTED(cmd)) {
-	level = 4;
+	level = RUBY_SAFE_LEVEL_MAX;
     }
 
     if (!RB_TYPE_P(cmd, T_STRING)) {