diff --git a/Quake/bspfile.h b/Quake/bspfile.h
index dd314575..d1a36f1e 100644
--- a/Quake/bspfile.h
+++ b/Quake/bspfile.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define	MAX_MAP_PLANES		32767
 #define	MAX_MAP_NODES		32767 // because negative shorts are contents
 #define	MAX_MAP_CLIPNODES	32767
-#define	MAX_MAP_LEAFS		65535 //johnfitz -- was 8192
+#define	MAX_MAP_LEAFS		70000 //johnfitz -- was 8192
 #define	MAX_MAP_VERTS		65535
 #define	MAX_MAP_FACES		65535
 #define	MAX_MAP_MARKSURFACES 65535
diff --git a/Quake/glquake.h b/Quake/glquake.h
index 9cbba52a..ff61cb11 100644
--- a/Quake/glquake.h
+++ b/Quake/glquake.h
@@ -290,7 +290,7 @@ extern overflowtimes_t dev_overflows; //this stores the last time overflow messa
 
 //johnfitz -- moved here from r_brush.c
 extern int gl_lightmap_format, lightmap_bytes;
-#define MAX_LIGHTMAPS 256 //johnfitz -- was 64
+#define MAX_LIGHTMAPS 512 //johnfitz -- was 64
 extern gltexture_t *lightmap_textures[MAX_LIGHTMAPS]; //johnfitz -- changed to an array
 
 extern int gl_warpimagesize; //johnfitz -- for water warp