diff --git a/src/gl/textures/gl_texture.cpp b/src/gl/textures/gl_texture.cpp
index f33fed6a3a..f1e6f0b0be 100644
--- a/src/gl/textures/gl_texture.cpp
+++ b/src/gl/textures/gl_texture.cpp
@@ -71,7 +71,7 @@ CCMD(gl_flush)
 
 CUSTOM_CVAR(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
 {
-	if (self < 0 || self > 5) self=4;
+	if (self < 0 || self > 6) self=4;
 	if (GLRenderer != NULL && GLRenderer->mSamplerManager != NULL) GLRenderer->mSamplerManager->SetTextureFilterMode();
 }
 
@@ -105,6 +105,7 @@ TexFilter_s TexFilter[]={
 	{GL_LINEAR_MIPMAP_NEAREST,		GL_LINEAR,		true},
 	{GL_LINEAR_MIPMAP_LINEAR,		GL_LINEAR,		true},
 	{GL_NEAREST_MIPMAP_LINEAR,		GL_NEAREST,		true},
+	{GL_LINEAR_MIPMAP_LINEAR,		GL_NEAREST,		true},
 };
 
 int TexFormat[]={
diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index b8a7bcdc01..b8abd71ec0 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -2625,6 +2625,7 @@ OPTVAL_INFRAREDANDTORCH 	= "Infrared and torch";
 OPTVAL_ANYFIXEDCOLORMAP 	= "Any fixed colormap";
 OPTVAL_NONENEARESTMIPMAP 	= "None (nearest mipmap)";
 OPTVAL_NONELINEARMIPMAP 	= "None (linear mipmap)";
+OPTVAL_NONETRILINEAR		= "None (trilinear)";
 OPTVAL_BILINEAR 			= "Bilinear";
 OPTVAL_TRILINEAR 			= "Trilinear";
 OPTVAL_RGBA8 				= "RGBA8";
diff --git a/wadsrc/static/menudef.z b/wadsrc/static/menudef.z
index 7f7791954e..59cb94f73e 100644
--- a/wadsrc/static/menudef.z
+++ b/wadsrc/static/menudef.z
@@ -19,6 +19,7 @@ OptionValue "FilterModes"
 	0, "$OPTVAL_NONE"
 	1, "$OPTVAL_NONENEARESTMIPMAP"
 	5, "$OPTVAL_NONELINEARMIPMAP"
+	6, "$OPTVAL_NONETRILINEAR"
 	2, "$OPTVAL_LINEAR"
 	3, "$OPTVAL_BILINEAR"
 	4, "$OPTVAL_TRILINEAR"