diff --git a/include/light/litfile.h b/include/light/litfile.h
index b512e84a..4f822cfe 100644
--- a/include/light/litfile.h
+++ b/include/light/litfile.h
@@ -20,6 +20,8 @@
 #ifndef __LIGHT_LITFILE_H__
 #define __LIGHT_LITFILE_H__
 
+#include <common/bspfile.h>
+
 #define LIT_VERSION 1
 
 typedef struct litheader_s {
@@ -27,6 +29,6 @@ typedef struct litheader_s {
     int version;
 } litheader_t;
 
-void WriteLitFile(const char *filename, int version);
+void WriteLitFile(const bspdata_t *bsp, const char *filename, int version);
 
 #endif /* __LIGHT_LITFILE_H__ */
diff --git a/light/light.c b/light/light.c
index befc023c..8e5a0131 100644
--- a/light/light.c
+++ b/light/light.c
@@ -302,13 +302,13 @@ main(int argc, const char **argv)
 
     WriteEntitiesToString();
 
+    if (write_litfile)
+	WriteLitFile(&bsp, source, LIT_VERSION);
+
     /* Still need to update from globals */
     GetBSPGlobals(&bsp);
     WriteBSPFile(source, &bsp, bsp_version);
 
-    if (write_litfile)
-	WriteLitFile(source, LIT_VERSION);
-
     end = I_FloatTime();
     logprint("%5.1f seconds elapsed\n", end - start);
 
diff --git a/light/litfile.c b/light/litfile.c
index 431de3fa..5f29190e 100644
--- a/light/litfile.c
+++ b/light/litfile.c
@@ -23,7 +23,7 @@
 #include <common/cmdlib.h>
 
 void
-WriteLitFile(const char *filename, int version)
+WriteLitFile(const bspdata_t *bsp, const char *filename, int version)
 {
     FILE *litfile;
     char litname[1024];
@@ -41,6 +41,6 @@ WriteLitFile(const char *filename, int version)
 
     litfile = SafeOpenWrite(litname);
     SafeWrite(litfile, &header, sizeof(header));
-    SafeWrite(litfile, lit_filebase, lightdatasize * 3);
+    SafeWrite(litfile, lit_filebase, bsp->lightdatasize * 3);
     fclose(litfile);
 }