diff --git a/tools/quake3/q3map2/autopk3.cpp b/tools/quake3/q3map2/autopk3.cpp
index 01fb5e76..de3007d2 100644
--- a/tools/quake3/q3map2/autopk3.cpp
+++ b/tools/quake3/q3map2/autopk3.cpp
@@ -71,6 +71,9 @@ static inline void tex2list( StrList& texlist, const StrList& EXtex, const StrLi
 	      !StrList_find( *rEXtex, token ) ) ){
 		texlist.emplace_back( token );
 	}
+	else{
+		Sys_FPrintf( SYS_WRN, "WARNING444: %s\n", token );
+	}
 	strcpy( dot, ".tga" ); // default extension for repacked shader text
 }
 
@@ -747,7 +750,12 @@ int repackBSPMain( Args& args ){
 	if( analyze )
 		return 0;
 
-
+	LoadShaderInfo();
+	for( const auto& si : Span( shaderInfo, shaderInfo + numShaderInfo ) ){
+		if( strIstr( si.shaderText, "skyparms" ) ){
+			res2list( pk3Shaders, si.shader );
+		}
+	}
 
 	pk3Shaderfiles = vfsListShaderFiles( g_game->shaderPath );
 
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 4bf58d4a..78ca120b 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -100,7 +100,7 @@
 
 #define DEF_RADIOSITY_BOUNCE    1.0f    /* ydnar: default to 100% re-emitted light */
 
-#define MAX_SHADER_INFO         8192
+#define MAX_SHADER_INFO         8192 * 16
 
 
 /* epair parsing (note case-sensitivity directive) */