diff --git a/ChangeLog b/ChangeLog
index b36eca7a26..1df05afcda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 17 15:15:53 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* safe.rb (safe_setter): of course, don't have to warn the limitation of
+	  $SAFE=3 after it's removed.
+
 Wed Jun 17 14:29:43 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* include/ruby/ruby.h: $SAFE=3 is now obsolete.
diff --git a/safe.c b/safe.c
index 68adfb7a3b..87dea2e724 100644
--- a/safe.c
+++ b/safe.c
@@ -75,9 +75,6 @@ safe_setter(VALUE val)
 		 "tried to downgrade safe level from %d to %d",
 		 th->safe_level, level);
     }
-    if (level == 3) {
-	rb_warning("$SAFE=3 does no sandboxing");
-    }
     if (level > SAFE_LEVEL_MAX) {
 	rb_raise(rb_eArgError, "$SAFE=3 and 4 is obsolete");
     }