diff --git a/include/light/entities.hh b/include/light/entities.hh
index 0e972b64..88a8e4b2 100644
--- a/include/light/entities.hh
+++ b/include/light/entities.hh
@@ -61,7 +61,7 @@ public:
 
     std::map<std::string, std::string> epairs;
     
-    const entity_t *targetent;
+    const entdict_t *targetent;
 
     qboolean generated;     // if true, don't write to the bsp
 
diff --git a/light/entities.cc b/light/entities.cc
index 4128af3a..3b6da817 100644
--- a/light/entities.cc
+++ b/light/entities.cc
@@ -115,7 +115,7 @@ LightStyleForTargetname(const std::string &targetname)
  * ==================
  * MatchTargets
  *
- * all_lights should not be modified after this (saves pointers to elements)
+ * entdicts should not be modified after this (saves pointers to elements)
  * ==================
  */
 static void
@@ -127,8 +127,8 @@ MatchTargets(void)
             continue;
         
         bool found = false;
-        for (const entity_t &target : all_lights) {
-            if (targetstr == ValueForKey(&target, "targetname")) {
+        for (const entdict_t &target : entdicts) {
+            if (targetstr == EntDict_StringForKey(target, "targetname")) {
                 entity.targetent = &target;
                 found = true;
                 break;
@@ -152,8 +152,9 @@ SetupSpotlights(void)
         if (strncmp(entity.classname(), "light", 5))
             continue;
         if (entity.targetent) {
-            VectorSubtract(*entity.targetent->origin.vec3Value(), *entity.origin.vec3Value(),
-                           entity.spotvec);
+            vec3_t targetOrigin;
+            GetVectorForKey(entity.targetent, "origin", targetOrigin);
+            VectorSubtract(targetOrigin, *entity.origin.vec3Value(), entity.spotvec);
             VectorNormalize(entity.spotvec);
             entity.spotlight = true;
         }