diff --git a/scripts/system/avatarFinderBeacon.js b/scripts/system/avatarFinderBeacon.js
new file mode 100644
index 0000000000..ca13f417e3
--- /dev/null
+++ b/scripts/system/avatarFinderBeacon.js
@@ -0,0 +1,87 @@
+//  avatarFinderBeacon.js
+//
+//  Created by Thijs Wenker on 12/7/16
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Shows 2km long red beams for each avatar outside of the 10 meter radius of your avatar, tries to ignore AC Agents.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+var MIN_DISPLAY_DISTANCE = 10.0; // meters
+var BEAM_COLOR = {red: 255, green: 0, blue: 0};
+var SHOW_THROUGH_WALLS = false;
+var BEACON_LENGTH = 2000.0; // meters
+var TRY_TO_IGNORE_AC_AGENTS = true;
+
+var HALF_BEACON_LENGTH = BEACON_LENGTH / 2.0;
+
+var beacons = {};
+
+// List of .fst files used by AC scripts, that should be ignored in the script in case TRY_TO_IGNORE_AC_AGENTS is enabled
+var POSSIBLE_AC_AVATARS = [
+    'http://hifi-content.s3.amazonaws.com/ozan/dev/avatars/invisible_avatar/invisible_avatar.fst'
+];
+
+AvatarFinderBeacon = function(avatar) {
+    var visible = false;
+    this.overlay = Overlays.addOverlay('line3d', {
+        color: BEAM_COLOR,
+        dashed: false,
+        start: Vec3.sum(avatar.position, {x: 0, y: -HALF_BEACON_LENGTH, z: 0}),
+        end: Vec3.sum(avatar.position, {x: 0, y: HALF_BEACON_LENGTH, z: 0}),
+        rotation: {x: 0, y: 0, z: 0, w: 1},
+        visible: visible,
+        drawInFront: SHOW_THROUGH_WALLS,
+        ignoreRayIntersection: true,
+        parentID: avatar.sessionUUID,
+        parentJointIndex: -2
+    });
+    this.cleanup = function() {
+        Overlays.deleteOverlay(this.overlay);
+    };
+    this.shouldShow = function() {
+        return (Vec3.distance(MyAvatar.position, avatar.position) >= MIN_DISPLAY_DISTANCE);
+    };
+    this.update = function() {
+        avatar = AvatarList.getAvatar(avatar.sessionUUID);
+        Overlays.editOverlay(this.overlay, {
+            visible: this.shouldShow()
+        });
+    };
+};
+
+function updateBeacon(avatarSessionUUID) {
+    if (!(avatarSessionUUID in beacons)) {
+        var avatar = AvatarList.getAvatar(avatarSessionUUID);
+        if (TRY_TO_IGNORE_AC_AGENTS && (POSSIBLE_AC_AVATARS.indexOf(avatar.skeletonModelURL) !== -1 ||
+                                        Vec3.length(avatar.position) === 0.0)) {
+            return;
+        }
+        beacons[avatarSessionUUID] = new AvatarFinderBeacon(avatar);
+        return;
+    }
+    beacons[avatarSessionUUID].update();
+}
+
+Script.update.connect(function() {
+    AvatarList.getAvatarIdentifiers().forEach(function(avatarSessionUUID) {
+        updateBeacon(avatarSessionUUID);
+    });
+});
+
+AvatarList.avatarRemovedEvent.connect(function(avatarSessionUUID) {
+    if (avatarSessionUUID in beacons) {
+        beacons[avatarSessionUUID].clear();
+        delete beacons[avatarSessionUUID];
+    }
+});
+
+Script.scriptEnding.connect(function() {
+    for (var sessionUUID in beacons) {
+        if (!beacons.hasOwnProperty(sessionUUID)) {
+            return;
+        }
+        beacons[sessionUUID].cleanup();
+    }
+});