diff --git a/lib/_debugger.js b/lib/_debugger.js
index 620215533b..db9344cb1b 100644
--- a/lib/_debugger.js
+++ b/lib/_debugger.js
@@ -1130,8 +1130,9 @@ Interface.prototype.list = function(delta) {
 
       var current = lineno == 1 + client.currentSourceLine,
           breakpoint = client.breakpoints.some(function(bp) {
-            return bp.script === client.currentScript &&
-                   bp.line == lineno;
+            return (bp.scriptReq === client.currentScript ||
+                    bp.script === client.currentScript) &&
+                    bp.line == lineno;
           });
 
       if (lineno == 1) {
diff --git a/test/simple/test-debugger-repl-restart.js b/test/simple/test-debugger-repl-restart.js
index 1a1ebcbe3b..5bfc3bbed7 100644
--- a/test/simple/test-debugger-repl-restart.js
+++ b/test/simple/test-debugger-repl-restart.js
@@ -22,10 +22,19 @@
 var repl = require('./helper-debugger-repl.js');
 
 repl.startDebugger('breakpoints.js');
+var linesWithBreakpoint = [
+    /1/, /2/, /3/, /4/, /5/, /\* 6/
+];
+// We slice here, because addTest will change the given array.
+repl.addTest('sb(6)', linesWithBreakpoint.slice());
+
+var initialLines = repl.initialLines.slice()
+initialLines.splice(2, 0, /Restoring/, /Warning/);
 
 // Restart the debugged script
 repl.addTest('restart', [
   /terminated/,
-].concat(repl.initialLines));
+].concat(initialLines));
 
+repl.addTest('list(5)', linesWithBreakpoint);
 repl.addTest('quit', []);