diff --git a/configure.in b/configure.in
index ce3c6db..9e0a1da 100644
--- a/configure.in
+++ b/configure.in
@@ -877,6 +877,21 @@ else
 	BUILD_TYPE="Debug"
 fi
 
+dnl CFLAGS for release and devel versions
+AC_ARG_ENABLE(profile,
+	[  --enable-profile          compile with profiling (for development)],
+	profile=$enable_profile
+)
+if test "x$profile" = xyes; then
+	BUILD_TYPE="$BUILD_TYPE Profile"
+	if test "x$GCC" = xyes; then
+		CFLAGS="`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` -pg"
+		LDFLAGS="$LDFLAGS -pg"
+	else
+		CFLAGS="$CFLAGS -p"
+	fi
+fi
+
 dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems
 dnl with many compilers that don't support the latest ISO standards. Well,
 dnl that is our cover story -- the reality is that we like them and don't want
diff --git a/source/gl_rsurf.c b/source/gl_rsurf.c
index a54ed73..c0e5e52 100644
--- a/source/gl_rsurf.c
+++ b/source/gl_rsurf.c
@@ -75,7 +75,7 @@ cvar_t		*gl_colorlights;
 #define	BLOCK_WIDTH		128
 #define	BLOCK_HEIGHT	128
 
-#define	MAX_LIGHTMAPS	64
+#define	MAX_LIGHTMAPS	256
 int			active_lightmaps;
 
 typedef struct glRect_s {