diff --git a/src/server/entry.qc b/src/server/entry.qc
index 0b953415..1cac59c5 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -516,17 +516,23 @@ ConsoleCmd(string cmd)
 		}
 		break;
 	case "spawn":
-		entity unit = spawn();
-		unit.classname =  strcat("spawnfunc_", argv(1));
-		self = unit;
+		entity eDef = spawn();
+		eDef.classname =  strcat("spawnfunc_", argv(1));
+		self = eDef;
 		callfunction(self.classname);
 		self = pl;
 
 		makevectors(pl.v_angle);
-		if (unit.identity == 1) {
-			NSEntity ent = (NSEntity)unit;
+		if (eDef.identity == 1) {
+			NSEntity ent = (NSEntity)eDef;
 		}
 		traceline(pl.origin, pl.origin + (v_forward * 1024), MOVE_NORMAL, pl);
+		setorigin(eDef, trace_endpos);
+		break;
+	case "spawndef":
+		NSEntity unit = EntityDef_CreateClassname(argv(1));
+		makevectors(pl.v_angle);
+		traceline(pl.origin, pl.origin + (v_forward * 1024), MOVE_NORMAL, pl);
 		setorigin(unit, trace_endpos);
 		break;
 #ifdef BOT_INCLUDED