diff --git a/lib/repl.js b/lib/repl.js
index 9cd88afb84..889a9f0d26 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -535,6 +535,10 @@ REPLServer.prototype.complete = function(line, callback) {
         if (this.useGlobal ||
             this.context.constructor &&
             this.context.constructor.name === 'Context') {
+          var contextProto = this.context;
+          while (contextProto = Object.getPrototypeOf(contextProto)) {
+            completionGroups.push(Object.getOwnPropertyNames(contextProto));
+          }
           completionGroups.push(Object.getOwnPropertyNames(this.context));
           addStandardGlobals();
           completionGroupsLoaded();
diff --git a/test/simple/test-repl-tab-complete.js b/test/simple/test-repl-tab-complete.js
index b38eaa13b7..4e9df6b632 100644
--- a/test/simple/test-repl-tab-complete.js
+++ b/test/simple/test-repl-tab-complete.js
@@ -202,3 +202,9 @@ testMe.complete(' ', function(error, data) {
   assert.deepEqual(data, [[],undefined]);
   clearTimeout(spaceTimeout);
 });
+
+// tab completion should pick up the global "toString" object, and
+// any other properties up the "global" object's prototype chain
+testMe.complete('toSt', function(error, data) {
+  assert.deepEqual(data, [['toString'], 'toSt']);
+});