diff --git a/include/d_ifacea.h b/include/d_ifacea.h
index d39e711c8..a01a3b983 100644
--- a/include/d_ifacea.h
+++ b/include/d_ifacea.h
@@ -44,7 +44,7 @@
 #define	CYCLE	128
 
 // !!! if this is changed, it must be changed in r_shared.h too !!!
-#define	MAXHEIGHT	1024
+#define	MAXHEIGHT	4096
 
 // !!! if this is changed, it must be changed in d_iface.h too !!!
 #define CACHE_SIZE	32		// used to align key data structures
diff --git a/include/r_shared.h b/include/r_shared.h
index 6811f66e3..5ae371797 100644
--- a/include/r_shared.h
+++ b/include/r_shared.h
@@ -39,8 +39,8 @@
 #define MAXWORKINGVERTS	(MAXVERTS+4)	// max points in an intermediate
 										//  polygon (while processing)
 // !!! if this is changed, it must be changed in d_ifacea.h too !!!
-#define	MAXHEIGHT	1024
-#define	MAXWIDTH	1280
+#define	MAXHEIGHT	4096
+#define	MAXWIDTH	4096
 #define MAXDIMENSION	((MAXHEIGHT > MAXWIDTH) ? MAXHEIGHT : MAXWIDTH)
 
 #define SIN_BUFFER_SIZE	(MAXDIMENSION+CYCLE)
diff --git a/libs/video/renderer/sw/d_scan.c b/libs/video/renderer/sw/d_scan.c
index 2fe290dc1..d2ccb7bc3 100644
--- a/libs/video/renderer/sw/d_scan.c
+++ b/libs/video/renderer/sw/d_scan.c
@@ -59,8 +59,8 @@ D_WarpScreen (void)
 	byte      **row;
 	
 	/* FIXME: allocate these arrays properly */
-	byte       *rowptr[1024 + AMP2 * 2];
-	int         column[1280 + AMP2 * 2];
+	byte       *rowptr[MAXHEIGHT + AMP2 * 2];
+	int         column[MAXWIDTH + AMP2 * 2];
 	float       wratio, hratio;
 
 	w = r_refdef.vrect.width;
diff --git a/libs/video/renderer/sw32/d_scan.c b/libs/video/renderer/sw32/d_scan.c
index d6b79dbc6..6b4c21051 100644
--- a/libs/video/renderer/sw32/d_scan.c
+++ b/libs/video/renderer/sw32/d_scan.c
@@ -63,8 +63,8 @@ D_WarpScreen (void)
 		int        *turb;
 		int        *col;
 		byte      **row;
-		byte       *rowptr[1024];
-		int         column[1280];
+		byte       *rowptr[MAXHEIGHT];
+		int         column[MAXWIDTH];
 		float       wratio, hratio;
 
 		w = r_refdef.vrect.width;
@@ -109,8 +109,8 @@ D_WarpScreen (void)
 		int        *turb;
 		int        *col;
 		short     **row;
-		short      *rowptr[1024];
-		int         column[1280];
+		short      *rowptr[MAXHEIGHT];
+		int         column[MAXWIDTH];
 		float       wratio, hratio;
 
 		w = r_refdef.vrect.width;
@@ -155,8 +155,8 @@ D_WarpScreen (void)
 		int        *turb;
 		int        *col;
 		int       **row;
-		int        *rowptr[1024];
-		int         column[1280];
+		int        *rowptr[MAXHEIGHT];
+		int         column[MAXWIDTH];
 		float       wratio, hratio;
 
 		w = r_refdef.vrect.width;
diff --git a/libs/video/renderer/sw32/sw32_rmain.c b/libs/video/renderer/sw32/sw32_rmain.c
index b064870ff..96230e655 100644
--- a/libs/video/renderer/sw32/sw32_rmain.c
+++ b/libs/video/renderer/sw32/sw32_rmain.c
@@ -908,7 +908,7 @@ R_InitTurb (void)
 {
 	int         i;
 
-	for (i = 0; i < 1280; i++) {
+	for (i = 0; i < MAXWIDTH; i++) {
 		sintable[i] = AMP + sin (i * 3.14159 * 2 / CYCLE) * AMP;
 		intsintable[i] = AMP2 + sin (i * 3.14159 * 2 / CYCLE) * AMP2;
 		// AMP2 not 20
diff --git a/nq/source/host.c b/nq/source/host.c
index b471098ae..ebe25d199 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -836,7 +836,7 @@ CL_Init_Memory (void)
 	else
 		minimum_memory = MINIMUM_MEMORY_LEVELPAK;
 
-	host_mem_size = Cvar_Get ("host_mem_size", "16", CVAR_NONE, NULL,
+	host_mem_size = Cvar_Get ("host_mem_size", "32", CVAR_NONE, NULL,
 							  "Amount of memory (in MB) to allocate for the "
 							  PROGRAM " heap");
 	if (mem_parm)