diff --git a/qbsp/map.c b/qbsp/map.c
index c3aa3d4c..1a43e5ea 100644
--- a/qbsp/map.c
+++ b/qbsp/map.c
@@ -28,9 +28,50 @@
 #define info_player_deathmatch	2
 #define	info_player_coop	4
 
-static int cAnimtex;
 static int rgfStartSpots;
 
+static void
+AddAnimTex(const char *name)
+{
+    int i, j, frame;
+    char framename[16], basechar = '0';
+
+    frame = name[1];
+    if (frame >= 'a' && frame <= 'j')
+	frame -= 'a' - 'A';
+
+    if (frame >= '0' && frame <= '9') {
+	frame -= '0';
+	basechar = '0';
+    } else if (frame >= 'A' && frame <= 'J') {
+	frame -= 'A';
+	basechar = 'A';
+    }
+
+    if (frame < 0 || frame > 9)
+	Error("Bad animating texture %s", name);
+
+    /*
+     * Always add the lower numbered animation frames first, otherwise
+     * many Quake engines will exit with an error loading the bsp.
+     */
+    snprintf(framename, sizeof(framename), "%s", name);
+    for (i = 0; i < frame; i++) {
+	framename[1] = basechar + i;
+	for (j = 0; j < map.nummiptex; j++) {
+	    if (!strcasecmp(framename, map.miptex[j]))
+		break;
+	}
+	if (j < map.nummiptex)
+	    continue;
+	if (map.nummiptex == map.maxmiptex)
+	    Error("Internal error: map.nummiptex > map.maxmiptex");
+
+	snprintf(map.miptex[j], sizeof(map.miptex[j]), "%s", framename);
+	map.nummiptex++;
+    }
+}
+
 int
 FindMiptex(const char *name)
 {
@@ -43,11 +84,14 @@ FindMiptex(const char *name)
     if (map.nummiptex == map.maxmiptex)
 	Error("Internal error: map.nummiptex > map.maxmiptex");
 
-    strcpy(map.miptex[i], name);
-    map.nummiptex++;
+    /* Handle animating textures carefully */
+    if (name[0] == '+') {
+	AddAnimTex(name);
+	i = map.nummiptex;
+    }
 
-    if (name[0] == '+')
-	cAnimtex++;
+    snprintf(map.miptex[i], sizeof(map.miptex[i]), "%s", name);
+    map.nummiptex++;
 
     return i;
 }
@@ -701,9 +745,8 @@ LoadMapFile(void)
     if (map.nummiptex > map.maxfaces)
 	Error("Internal error: map.nummiptex > map.maxfaces");
     else if (map.nummiptex < map.maxfaces) {
-	// For stuff in AddAnimatingTex, make room available
 	pTemp = map.miptex;
-	map.maxmiptex = map.nummiptex + cAnimtex * 20;
+	map.maxmiptex = map.nummiptex;
 	map.miptex = AllocMem(MIPTEX, map.maxmiptex, true);
 	memcpy(map.miptex, pTemp, map.nummiptex * rgcMemSize[MIPTEX]);
 	FreeMem(pTemp, MIPTEX, map.maxfaces);
diff --git a/qbsp/wad.c b/qbsp/wad.c
index bd6287aa..f4d8bfd1 100644
--- a/qbsp/wad.c
+++ b/qbsp/wad.c
@@ -25,7 +25,6 @@
 #include "wad.h"
 
 static void WADList_LoadTextures(const wad_t *wadlist, dmiptexlump_t *lump);
-static void WADList_AddAnimatingTextures(const wad_t *wadlist);
 static int WAD_LoadLump(const wad_t *wad, const char *name, byte *dest);
 
 
@@ -162,8 +161,6 @@ WADList_Process(const wad_t *wadlist)
     dmiptexlump_t *miptexlump;
     struct lumpdata *texdata = &pWorldEnt->lumps[BSPTEX];
 
-    WADList_AddAnimatingTextures(wadlist);
-
     /* Count space for miptex header/offsets */
     texdata->count = offsetof(dmiptexlump_t, dataofs[map.nummiptex]);
 
@@ -238,29 +235,3 @@ WAD_LoadLump(const wad_t *wad, const char *name, byte *dest)
 
     return 0;
 }
-
-
-static void
-WADList_AddAnimatingTextures(const wad_t *wadlist)
-{
-    int base;
-    int i, j;
-    char name[32];
-
-    base = map.nummiptex;
-
-    for (i = 0; i < base; i++) {
-	if (map.miptex[i][0] != '+')
-	    continue;
-	strcpy(name, map.miptex[i]);
-
-	/* Search for all animations (0-9) and alt-animations (A-J) */
-	for (j = 0; j < 20; j++) {
-	    name[1] = (j < 10) ? '0' + j : 'a' + j - 10;
-	    if (WADList_FindTexture(wadlist, name))
-		FindMiptex(name);
-	}
-    }
-
-    Message(msgStat, "%8d texture frames added", map.nummiptex - base);
-}