diff --git a/engine/Makefile b/engine/Makefile
index 197c99da..0271dcb3 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -1564,7 +1564,7 @@ scintilla$(BITS)_static:
 	@$(MAKE) reldir OUT_DIR=$(RELEASE_DIR)/qcc
 	@$(MAKE) $(RELEASE_DIR)/scintilla$(BITS).a VPATH="$(SCINTILLA_DIRS)" CFLAGS="$(SCINTILLA_INC) -DDISABLE_D2D -DSTATIC_BUILD -DSCI_LEXER" OUT_DIR=$(RELEASE_DIR)/qcc WCFLAGS="$(WCFLAGS) -Os"
 qccgui-scintilla: scintilla$(BITS)_static
-	@$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" WCFLAGS="$(WCFLAGS) -DSCISTATIC" LDFLAGS="$(LDFLAGS) $(RELEASE_DIR)/scintilla$(BITS).a -static -luuid -lole32 -limm32 -lstdc++ -lcomdlg32 -lcomctl32 -mwindows"
+	@$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" WCFLAGS="$(WCFLAGS) -DSCISTATIC" LDFLAGS="$(LDFLAGS) $(RELEASE_DIR)/scintilla$(BITS).a -static -luuid -lole32 -limm32 -lstdc++ -lcomdlg32 -lcomctl32 -lshlwapi -mwindows"
 
 ifdef windir
 debugdir:
diff --git a/engine/gl/gl_model.c b/engine/gl/gl_model.c
index e5b740ca..a9463f69 100644
--- a/engine/gl/gl_model.c
+++ b/engine/gl/gl_model.c
@@ -273,6 +273,8 @@ int RelightThread(void *arg)
 	free(threadctx);
 	return 0;
 }
+#else
+void *lightmainthreadctx;
 #endif
 
 void Mod_Think (void)
@@ -315,7 +317,9 @@ void Mod_Think (void)
 			return;
 		}
 #else
-		LightFace(lightcontext, relitsurface);
+		if (!lightmainthreadctx)
+			lightmainthreadctx = malloc(lightthreadctxsize);
+		LightFace(lightcontext, lightmainthreadctx, relitsurface);
 		Mod_UpdateLightmap(relitsurface);
 
 		relitsurface++;
@@ -338,6 +342,9 @@ void Mod_Think (void)
 				}
 				relightthreads = 0;
 			}
+#else
+			free(lightmainthreadctx);
+			lightmainthreadctx = NULL;
 #endif
 
 			LightShutdown(lightcontext, lightmodel);
@@ -447,6 +454,9 @@ void Mod_ClearAll (void)
 		relightthread[i] = NULL;
 	}
 	relightthreads = 0;
+#else
+	free(lightmainthreadctx);
+	lightmainthreadctx = NULL;
 #endif
 	lightmodel = NULL;
 #endif