diff --git a/src/common/engine/namedef.h b/src/common/engine/namedef.h
index 47dea4f10..146dd9bd1 100644
--- a/src/common/engine/namedef.h
+++ b/src/common/engine/namedef.h
@@ -702,6 +702,10 @@ xx(lightdistancefloor)
 xx(lightcolorceiling)
 xx(lightintensityceiling)
 xx(lightdistanceceiling)
+xx(suncolor)
+xx(sundirx)
+xx(sundiry)
+xx(sundirz)
 
 // USDF keywords
 xx(Amount)
diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp
index f11774157..b579c0469 100644
--- a/src/maploader/udmf.cpp
+++ b/src/maploader/udmf.cpp
@@ -758,6 +758,10 @@ public:
 			case NAME_lightdistance:
 			case NAME_lightinnerangle:
 			case NAME_lightouterangle:
+			case NAME_suncolor:
+			case NAME_sundirx:
+			case NAME_sundiry:
+			case NAME_sundirz:
 				CHECK_N(Zd | Zdt)
 				break;
 
@@ -1135,7 +1139,7 @@ public:
 			case NAME_lightintensity:
 			case NAME_lightdistance:
 				CHECK_N(Zd | Zdt)
-					break;
+				break;
 
 			default:
 				if (strnicmp("user_", key.GetChars(), 5))
@@ -1970,7 +1974,7 @@ public:
 				case NAME_lightintensityceiling:
 				case NAME_lightdistanceceiling:
 					CHECK_N(Zd | Zdt)
-						break;
+					break;
 
 				default:
 					if (strnicmp("user_", key.GetChars(), 5))
diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index 864fe5132..5b8263c85 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -139,6 +139,7 @@ DoomEdNums
   9875 = LightProbe
   9876 = PointLightStatic
   9881 = SpotLightStatic
+  9890 = ZDRaySunlight
   9982 = SecActEyesAboveC
   9983 = SecActEyesBelowC
   9988 = CustomSprite
diff --git a/wadsrc/static/zscript/actors/shared/staticlights.zs b/wadsrc/static/zscript/actors/shared/staticlights.zs
index ede5e2c1d..f799a9c2e 100644
--- a/wadsrc/static/zscript/actors/shared/staticlights.zs
+++ b/wadsrc/static/zscript/actors/shared/staticlights.zs
@@ -29,3 +29,7 @@ class StaticLightBase : Actor
 
 class PointLightStatic : StaticLightBase {}
 class SpotLightStatic : StaticLightBase {}
+
+// Sunlight Actors to define sunlight properties for the current map
+
+class ZDRaySunlight : Actor {}