diff --git a/Effects/urban.eff b/Effects/urban.eff
index ef355b43b..1a0123d5d 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -48,24 +48,22 @@
 					<value type="float">4.0</value>
 					<float-property>/sim/rendering/shaders/urban</float-property>
 				</less-equal>
-				<and>
-					<or>
-						<less-equal>
-							<value type="float">2.0</value>
-							<glversion/>
-						</less-equal>
-						<and>
-							<extension-supported>GL_ARB_shader_objects</extension-supported>
-							<extension-supported>GL_ARB_shading_language_100</extension-supported>
-							<extension-supported>GL_ARB_vertex_shader</extension-supported>
-							<extension-supported>GL_ARB_fragment_shader</extension-supported>
-						</and>
-					</or>
-					<or>
-						<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
-						<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
-					</or>
-				</and>
+				<or>
+					<less-equal>
+						<value type="float">2.0</value>
+						<glversion/>
+					</less-equal>
+					<and>
+						<extension-supported>GL_ARB_shader_objects</extension-supported>
+						<extension-supported>GL_ARB_shading_language_100</extension-supported>
+						<extension-supported>GL_ARB_vertex_shader</extension-supported>
+						<extension-supported>GL_ARB_fragment_shader</extension-supported>
+					</and>
+				</or>
+				<or>
+					<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
+					<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
+				</or>
 			</and>
 		</predicate>
 		<pass>
@@ -295,24 +293,19 @@
 					<value type="float">2.0</value>
 					<float-property>/sim/rendering/shaders/quality-level</float-property>
 				</less-equal>
-				<and>
-					<or>
-						<less-equal>
-							<value type="float">2.0</value>
-							<glversion/>
-						</less-equal>
-						<and>
-							<extension-supported>GL_ARB_shader_objects</extension-supported>
-							<extension-supported>GL_ARB_shading_language_100</extension-supported>
-							<extension-supported>GL_ARB_vertex_shader</extension-supported>
-							<extension-supported>GL_ARB_fragment_shader</extension-supported>
-						</and>
-					</or>
-					<or>
-						<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
-						<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
-					</or>
-				</and>
+				<or>
+					<less-equal>
+						<value type="float">2.0</value>
+						<glversion/>
+					</less-equal>
+					<and>
+						<extension-supported>GL_ARB_shader_objects</extension-supported>
+						<extension-supported>GL_ARB_shading_language_100</extension-supported>
+						<extension-supported>GL_ARB_vertex_shader</extension-supported>
+						<extension-supported>GL_ARB_fragment_shader</extension-supported>
+					</and>
+				</or>
+				<!-- quality level below 4.0 doesn't require GL_ATI_shader_texture_lod or GL_ARB_shader_texture_lod -->
 			</and>
 		</predicate>
 		<pass>
diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index e689a2676..2d517abf4 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -309,5 +309,6 @@
  <trace-read-desc>Trace the reads for a property;</trace-read-desc>
  <trace-write-desc>Trace the writes for a property;</trace-write-desc>
  <log-level-desc>Specify which logging level to use</log-level-desc>
+ <log-class-desc>Specify which logging class(es) to use</log-class-desc>
 
 </PropertyList>
diff --git a/options.xml b/options.xml
index 293cfd616..c3660bc22 100644
--- a/options.xml
+++ b/options.xml
@@ -1150,6 +1150,12 @@
     <description>strings/log-level-desc</description>
    </option>
 
+   <option>
+    <name>log-class</name>
+    <arg>[ai,environment,flight,general,io,network,sound,terrain,...]</arg>
+    <description>strings/log-class-desc</description>
+   </option>
+
    <option>
     <name>trace-read</name>
     <arg>property</arg>