diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c
index 2b76469a9..0851613e9 100644
--- a/tools/qflight/source/properties.c
+++ b/tools/qflight/source/properties.c
@@ -175,6 +175,13 @@ set_properties (entity_t *ent, plitem_t *dict)
 	const char *str;
 
 	if (properties) {
+		prop = PL_ObjectForKey (properties, ent->classname);
+		if ((p = get_item ("_light_name", dict, 0))
+			&& (str = PL_String (p)))
+			prop = PL_ObjectForKey (properties, str);
+		if (!prop)
+			prop = PL_ObjectForKey (properties, ent->classname);
+
 		prop = PL_ObjectForKey (properties, ent->classname);
 		if (!prop)
 			prop = PL_ObjectForKey (properties, "default");