diff --git a/src/r_sky.cpp b/src/r_sky.cpp
index 7a45bff50..a3dc63b80 100644
--- a/src/r_sky.cpp
+++ b/src/r_sky.cpp
@@ -53,6 +53,8 @@ bool		skystretch;
 fixed_t		sky1cyl,		sky2cyl;
 double		sky1pos,		sky2pos;
 
+EXTERN_CVAR(Bool, cl_oldfreelooklimit)
+
 CUSTOM_CVAR(Int, testskyoffset, 0, 0)
 {
 	R_InitSkyMap();
@@ -67,6 +69,7 @@ CUSTOM_CVAR (Int, r_skymode, 2, CVAR_ARCHIVE)
 
 
 int			freelookviewheight;
+int 		skyoffset;
 
 //==========================================================================
 //
@@ -117,17 +120,17 @@ void R_InitSkyMap ()
 	//        h >  200: Unstretched, but the baseline is shifted down so that the top
 	//                  of the texture is at the top of the screen when looking fully up.
 	skyheight = skytex1->GetScaledHeight();
-	skystretch = false;
+	skystretch = (r_skymode == 1
+				  && skyheight >= 128 && skyheight < 310
+				  && level.IsFreelookAllowed()
+				  && !(level.flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
+	skyoffset = cl_oldfreelooklimit? 0 : skyheight >= 200? 110 : 138;
 	skytexturemid = 0;
 	if (skyheight >= 128 && skyheight < 200)
 	{
-		skystretch = (r_skymode == 1
-					  && skyheight >= 128
-					  && level.IsFreelookAllowed()
-					  && !(level.flags & LEVEL_FORCETILEDSKY)) ? 1 : 0;
 		skytexturemid = -28;
 	}
-	else if (skyheight > 200)
+	else if (skyheight >= 200)
 	{
 		skytexturemid = (200 - skyheight) * skytex1->Scale.Y +((r_skymode == 2 && !(level.flags & LEVEL_FORCETILEDSKY)) ? skytex1->SkyOffset + testskyoffset : 0);
 	}
@@ -143,9 +146,9 @@ void R_InitSkyMap ()
 
 	if (skystretch)
 	{
-		skyscale *= (double)SKYSTRETCH_HEIGHT / skyheight;
-		skyiscale *= skyheight / (float)SKYSTRETCH_HEIGHT;
-		skytexturemid *= skyheight / (double)SKYSTRETCH_HEIGHT;
+		skyscale *= (double)(SKYSTRETCH_HEIGHT + skyoffset) / skyheight;
+		skyiscale *= skyheight / (float)(SKYSTRETCH_HEIGHT + skyoffset);
+		skytexturemid *= skyheight / (double)(SKYSTRETCH_HEIGHT + skyoffset);
 	}
 
 	// The standard Doom sky texture is 256 pixels wide, repeated 4 times over 360 degrees,
diff --git a/src/swrenderer/plane/r_skyplane.cpp b/src/swrenderer/plane/r_skyplane.cpp
index 266b46ed4..56186332a 100644
--- a/src/swrenderer/plane/r_skyplane.cpp
+++ b/src/swrenderer/plane/r_skyplane.cpp
@@ -54,6 +54,8 @@
 #include "swrenderer/r_renderthread.h"
 #include "g_levellocals.h"
 
+extern int skyoffset;
+
 CVAR(Bool, r_linearsky, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);
 EXTERN_CVAR(Int, r_skymode)
 
@@ -152,7 +154,7 @@ namespace swrenderer
 				frontcyl = MAX(frontskytex->GetWidth(), frontxscale);
 				if (skystretch)
 				{
-					skymid = skymid * frontskytex->GetScaledHeightDouble() / SKYSTRETCH_HEIGHT;
+					skymid = skymid * frontskytex->GetScaledHeightDouble() / (SKYSTRETCH_HEIGHT + skyoffset);
 				}
 			}
 		}