diff --git a/tools/quake3/q3map2/surface_extra.cpp b/tools/quake3/q3map2/surface_extra.cpp
index f3ded1d1..d971669b 100644
--- a/tools/quake3/q3map2/surface_extra.cpp
+++ b/tools/quake3/q3map2/surface_extra.cpp
@@ -134,7 +134,7 @@ void WriteSurfaceExtraFile( const char *path ){
 	Sys_Printf( "--- WriteSurfaceExtraFile ---\n" );
 
 	/* open the file */
-	auto srfPath = StringOutputStream( 256 )( PathExtensionless( path ), ".srf" );
+	const auto srfPath = StringOutputStream( 256 )( path, ".srf" );
 	Sys_Printf( "Writing %s\n", srfPath.c_str() );
 	FILE *sf = SafeOpenWrite( srfPath, "wt" );
 
diff --git a/tools/quake3/q3map2/writebsp.cpp b/tools/quake3/q3map2/writebsp.cpp
index 2c55cde2..771e8046 100644
--- a/tools/quake3/q3map2/writebsp.cpp
+++ b/tools/quake3/q3map2/writebsp.cpp
@@ -342,7 +342,7 @@ void EndBSPFile( bool do_write ){
 		WriteSurfaceExtraFile( source );
 
 		/* write the bsp */
-		auto path = StringOutputStream( 256 )( source, ".bsp" );
+		const auto path = StringOutputStream( 256 )( source, ".bsp" );
 		Sys_Printf( "Writing %s\n", path.c_str() );
 		WriteBSPFile( path );
 	}