diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h
index 18680de82..bc418e0fb 100644
--- a/src/CxbxKrnl/HLEDataBase.h
+++ b/src/CxbxKrnl/HLEDataBase.h
@@ -93,6 +93,7 @@ enum XRefDataBaseOffset
     XREF_D3DRS_ROPZREAD,
     XREF_D3DRS_DONOTCULLUNCOMPRESSED,
     XREF_D3DRS_STENCILCULLENABLE,
+    XREF_D3DDevice_SetLight,
     XREF_D3DDevice_LazySetStateVB,
     XREF_D3D_BlockOnResource,
     XREF_D3D_BlockOnTime,
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
index 845491813..a5c1d6ec4 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
@@ -397,13 +397,13 @@ OOVPA_END;
 // ******************************************************************
 // * D3DDevice_LightEnable
 // ******************************************************************
-OOVPA_XREF(D3DDevice_LightEnable, 3911, 1+24,// valid upto at least 4627, next known difference is from 5344 onwards
+OOVPA_XREF(D3DDevice_LightEnable, 3911, 2+24,// valid upto at least 4627, next known difference is from 5344 onwards
 
     XRefNoSaveIndex,
-    XRefOne)
+    XRefTwo)
 
     XREF_ENTRY(0x0B, XREF_D3DDEVICE),
-    //XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT),
+    XREF_ENTRY(0x67, XREF_D3DDevice_SetLight),
 
         { 0x00, 0x83 },
         { 0x01, 0xEC },
@@ -3677,7 +3677,10 @@ OOVPA_END;
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
-OOVPA_NO_XREF(D3DDevice_SetLight, 3911, 15)
+OOVPA_XREF(D3DDevice_SetLight, 3911, 15,
+
+    XREF_D3DDevice_SetLight,
+    XRefZero)
 
         { 0x15, 0x00 },
         { 0x16, 0x00 },
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
index 72a5dd5e6..f4c5b77c9 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
@@ -3133,13 +3133,13 @@ OOVPA_END;
 // ******************************************************************
 // * D3DDevice_LightEnable
 // ******************************************************************
-OOVPA_XREF(D3DDevice_LightEnable, 3911, 1+24,// valid upto at least 4627, next known difference is from 5028 onwards
+OOVPA_XREF(D3DDevice_LightEnable, 3911, 2+24,// valid upto at least 4627, next known difference is from 5028 onwards
 
 	XRefNoSaveIndex,
 	XRefOne)
 
 	XREF_ENTRY(0x0B, XREF_D3DDEVICE),
-	//XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT),
+	XREF_ENTRY(0x67, XREF_D3DDevice_SetLight),
 
 	{ 0x00, 0x83 },
 	{ 0x01, 0xEC },
diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
index e0cd2c49a..b36319961 100644
--- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
+++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
@@ -131,7 +131,10 @@ OOVPA_END;
 // ******************************************************************
 // * D3DDevice_SetLight
 // ******************************************************************
-OOVPA_NO_XREF(D3DDevice_SetLight, 5344, 15)
+OOVPA_XREF(D3DDevice_SetLight, 5344, 15,
+
+    XREF_D3DDevice_SetLight,
+    XRefZero)
 
         // D3DDevice_SetLight+0x1f : add REG, 0x10
         { 0x1F, 0x83 },
@@ -274,13 +277,13 @@ OOVPA_END;
 // ******************************************************************
 // * D3DDevice_LightEnable
 // ******************************************************************
-OOVPA_XREF(D3DDevice_LightEnable, 5344, 1+24,
+OOVPA_XREF(D3DDevice_LightEnable, 5344, 2+24,
 
 	XRefNoSaveIndex,
-	XRefOne)
+	XRefTwo)
 
 	XREF_ENTRY(0x0B, XREF_D3DDEVICE),
-	//XREF_ENTRY(0x67, XREF_D3DDEVICE_SETLIGHT),
+	XREF_ENTRY(0x67, XREF_D3DDevice_SetLight),
 
 	{ 0x00, 0x83 },
 	{ 0x01, 0xEC },