diff --git a/ChangeLog b/ChangeLog
index 7f065332d9..7c7462df23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 25 01:18:55 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/debug.rb (display_list): Fix debug listing when called from the
+	  same file it has been required.  patch by Dario Bertini <berdario AT
+	  gmail.com> [Bug #8318] [fix GH-280]
+
 Wed Apr 24 21:51:13 2013  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in: Check mblen().
diff --git a/lib/debug.rb b/lib/debug.rb
index 40886b14a6..b5ae3e95c8 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -753,8 +753,8 @@ EOHELP
     end
 
     def display_list(b, e, file, line)
-      stdout.printf "[%d, %d] in %s\n", b, e, file
       if lines = SCRIPT_LINES__[file] and lines != true
+        stdout.printf "[%d, %d] in %s\n", b, e, file
         b.upto(e) do |n|
           if n > 0 && lines[n-1]
             if n == line
@@ -764,6 +764,9 @@ EOHELP
             end
           end
         end
+      elsif File.exists? file
+        Tracer::Single.get_line(file, line)
+        display_list(b, e, file, line)
       else
         stdout.printf "No sourcefile available for %s\n", file
       end