diff --git a/fgd/bases/BaseClusteredDynLight.fgd b/fgd/bases/BaseClusteredDynLight.fgd
index d6399b37..5aa7a3fb 100644
--- a/fgd/bases/BaseClusteredDynLight.fgd
+++ b/fgd/bases/BaseClusteredDynLight.fgd
@@ -22,11 +22,21 @@
 		0: "None"
 		1: "Static Only"
 		]
+	_volumetricmode(choices) : "Volumetric light mode" : 2 : "The type of volumetric lighting to use for the light." = 
+		[
+		0: "None"
+		2: "Dynamic Only"
+		]
 	slopescale(float) : "Slope Scale" : 1.0 : "Shadowmap slope scale. Higher values tend to eat away at the contact shadow, but can get rid of shadow acne. Higher values will also tend to shine through small shadow blockers"
 		
 	texturename(string) : "Cookie Texture Name" : "" : "The cookie texture to use for the light. An empty value means no cookie texture."
 	textureframe(integer) : "Cookie Texture Frame" : 0 : "The frame of the cookie texture to use for the light."
 	
+	volumetric_lightscale(float) : "Volumetric Light Scale" : 1.0 : "The amount to scale the light's contribution in volumetric lighting"
+	volumetric_density(float) : "Volumetric Density" : 0.0 : "The volumetric density 'created' by the light. If a light would light an area of space, it adds this density to that area."
+	
 	input SetCookieTexture(string) : "Set the cookie texture of this light. An empty value means no cookie texture."
 	input SetCookieTextureFrame(integer) : "Set the frame texture of the cookie texture for this light."
+	input SetVolumetricLightScale(float) : "Set the volumetric light scale of this light."
+	input SetVolumetricDensity(float) : "Set the volumetric density of this light."
 	]
diff --git a/fgd/point/obb_volumefog.fgd b/fgd/point/obb_volumefog.fgd
new file mode 100644
index 00000000..682de584
--- /dev/null
+++ b/fgd/point/obb_volumefog.fgd
@@ -0,0 +1,30 @@
+@PointClass base(BaseEntityPoint) 
+	size(-4 -4 -4, 4 4 4)
+	orientedboundingbox(width, height, depth)
+= obb_volumefog: "An oriented bounding box containing volumetric fog"
+	[
+	width(float) : "Half-Width (G)" : 256 : "Width of the OBB, on the Green axis."
+	height(float) : "Half-Height (B)" : 256 : "Height of the OBB, on the Blue axis."
+	depth(float) : "Half-Depth (R)" : 256 : "Depth of the OBB, on the Red axis."
+	spheroid_volume(boolean) : "Spheroid" : 0 : "Use a spheroid rather than an OBB for the volume"
+	
+	emissive_color(color255) : "Emissive Color" : "0 0 0 255" : "Emissive color and brightness of the fog material"
+	density(float) : "Density" : 0.1 : "Density of the fog material"
+	scattering_color(color255) : "Scattering Color" : "255 255 255 255" : "Scattering color and scale of the fog material"
+	phase(float) : "Phase" : 0.0 : "Phase coefficient of the fog material"
+	
+	texture_name(texture) : "Texture Name" : "" : "3D-in-2D VTF Texture containing color (RGB) and density (A) for the volume. Leave empty for no texture." + 
+		"Please note that obb_volumefog uses .vtf files directly and does not use .vmt files. " +
+		"The material browser is only available here to assist with finding textures since materials typically have the same name as their textures."
+	texture_slices_x(integer) : "Texture Slices (X)" : "16" : "The number of slices over the texture's X-axis."
+	texture_slices_y(integer) : "Texture Slices (Y)" : "16" : "The number of slices over the texture's Y-axis."
+	
+	input Toggle(void) : "Toggle the fog volume."
+	input TurnOn(void) : "Turn on the fog volume."
+	input TurnOff(void) : "Turn off the fog volume."
+	input SetHalfSize(vector) : "Set the half-size of the bounding box, before rotation."
+	input SetEmissiveColor(vector) : "Set the emissive color of the fog."
+	input SetDensity(float) : "Set the density of the fog."
+	input SetScatteringColor(vector) : "Set the scattering color of the fog."
+	input SetPhase(float) : "Set the phase of the fog."
+	]