diff --git a/engine/common/mod_bmodel.c b/engine/common/mod_bmodel.c
index 264fe5aa..5c992f21 100644
--- a/engine/common/mod_bmodel.c
+++ b/engine/common/mod_bmodel.c
@@ -417,7 +417,7 @@ static int Mod_FindTextureInWadList( wadlist_t *list, const char *name, char *ds
 	{
 		char path[MAX_VA_STRING];
 
-		Q_snprintf( path, sizeof( path ), "%s.wad/%s.mip", list->wadnames[i], name );
+		Q_snprintf( path, sizeof( path ), "%s/%s.mip", list->wadnames[i], name );
 
 		if( FS_FileExists( path, false ))
 		{
@@ -1929,7 +1929,6 @@ static int Mod_LoadEntities_splitstr_handler( char *prev, char *next, void *user
 	{
 		int num = wadlist->count++;
 		Q_strncpy( wadlist->wadnames[num], wad, sizeof( wadlist->wadnames[0] ));
-		COM_StripExtension( wadlist->wadnames[num] );
 		wadlist->wadusage[num] = 0;
 	}
 
@@ -3569,16 +3568,12 @@ static qboolean Mod_LoadBmodelLumps( model_t *mod, const byte *mod_base, qboolea
 
 	for( i = 0; i < world.wadlist.count; i++ )
 	{
-		string wadname;
-
 		if( !world.wadlist.wadusage[i] )
 			continue;
 
-		Q_snprintf( wadname, sizeof( wadname ), "%s.wad", world.wadlist.wadnames[i] );
-
 		if( !wadlist_warn )
 		{
-			ret = Q_snprintf( &wadvalue[len], sizeof( wadvalue ), "%s; ", wadname );
+			ret = Q_snprintf( &wadvalue[len], sizeof( wadvalue ), "%s; ", world.wadlist.wadnames[i] );
 			if( ret == -1 )
 			{
 				Con_DPrintf( S_WARN "Too many wad files for output!\n" );
diff --git a/engine/common/mod_local.h b/engine/common/mod_local.h
index c01f344a..17bf52f2 100644
--- a/engine/common/mod_local.h
+++ b/engine/common/mod_local.h
@@ -85,9 +85,9 @@ typedef struct
 
 typedef struct wadlist_s
 {
-	char			wadnames[MAX_MAP_WADS][32];
-	int			wadusage[MAX_MAP_WADS];
-	int			count;
+	char wadnames[MAX_MAP_WADS][36]; // including .wad extension
+	int  wadusage[MAX_MAP_WADS];
+	int  count;
 } wadlist_t;
 
 typedef struct world_static_s
diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c
index 199ee136..31444a1a 100644
--- a/engine/server/sv_init.c
+++ b/engine/server/sv_init.c
@@ -376,9 +376,7 @@ static void SV_CreateGenericResources( void )
 	{
 		if( world.wadlist.wadusage[i] > 0 )
 		{
-			string wadname;
-			Q_snprintf( wadname, sizeof( wadname ), "%s.wad", world.wadlist.wadnames[i] );
-			SV_GenericIndex( wadname );
+			SV_GenericIndex( world.wadlist.wadnames[i] );
 		}
 	}
 }