diff --git a/ref/vk/data/valve/luchiki/maps/c0a0.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c0a0a.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0a.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0a.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0a.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c0a0b.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0b.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0b.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0b.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c0a0c.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0c.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0c.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0c.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c0a0d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c0a0e.bsp.patch b/ref/vk/data/valve/luchiki/maps/c0a0e.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c0a0e.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c0a0e.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0a.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0a.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0a.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0a.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0b.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0b.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0b.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0b.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0c.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0c.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0c.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0c.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a0e.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a0e.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a0e.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a0e.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1a.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1a.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1a.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1a.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1b.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1b.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1b.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1b.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1c.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1c.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1c.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1c.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a1f.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a1f.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a1f.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a1f.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a2.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a2.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a2.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a2.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a2a.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a2a.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a2a.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a2a.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a2b.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a2b.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a2b.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a2b.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a2c.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a2c.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a2c.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a2c.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a2d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a2d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a2d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a2d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3a.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3a.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3a.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3a.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3b-dayone.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3b-dayone.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3b-dayone.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3b-dayone.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3b.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3b.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3b.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3b.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3c-dayone.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3c-dayone.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3c-dayone.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3c-dayone.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a3d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a3d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a3d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a3d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a4d.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a4d.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a4d.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a4d.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c1a4k.bsp.patch b/ref/vk/data/valve/luchiki/maps/c1a4k.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c1a4k.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c1a4k.patch
diff --git a/ref/vk/data/valve/luchiki/maps/c2a5.bsp.patch b/ref/vk/data/valve/luchiki/maps/c2a5.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/c2a5.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/c2a5.patch
diff --git a/ref/vk/data/valve/luchiki/maps/hldemo1.bsp.patch b/ref/vk/data/valve/luchiki/maps/hldemo1.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/hldemo1.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/hldemo1.patch
diff --git a/ref/vk/data/valve/luchiki/maps/hldemo2.bsp.patch b/ref/vk/data/valve/luchiki/maps/hldemo2.patch
similarity index 100%
rename from ref/vk/data/valve/luchiki/maps/hldemo2.bsp.patch
rename to ref/vk/data/valve/luchiki/maps/hldemo2.patch
diff --git a/ref/vk/vk_mapents.c b/ref/vk/vk_mapents.c
index d0965489..6317eafb 100644
--- a/ref/vk/vk_mapents.c
+++ b/ref/vk/vk_mapents.c
@@ -699,7 +699,22 @@ static void parsePatches( const model_t *const map ) {
 		g_patch.surfaces_count = 0;
 	}
 
-	Q_snprintf(filename, sizeof(filename), "luchiki/%s.patch", map->name);
+	{
+		const char *ext = NULL;
+
+		// Find extension (if any)
+		{
+			const char *p = map->name;
+			for(; *p; ++p)
+				if (*p == '.')
+					ext = p;
+			if (!ext)
+				ext = p;
+		}
+
+		Q_snprintf(filename, sizeof(filename), "luchiki/%.*s.patch", (int)(ext - map->name), map->name);
+	}
+
 	DEBUG("Loading patches from file \"%s\"", filename);
 	data = gEngine.fsapi->LoadFile( filename, 0, false );
 	if (!data) {