diff --git a/zsnes/src/configure.in b/zsnes/src/configure.in
index 05ed6059..46ec14b6 100644
--- a/zsnes/src/configure.in
+++ b/zsnes/src/configure.in
@@ -134,8 +134,10 @@ else
 	dnl 	Because of the way zsnes is written, these options make
 	dnl zsnes more easily deal with small instruction caches, and more
 	dnl effectivly use branch prediction.
+	dnl NOTE: -fomit-frame-pointer causes some segfaults
+	dnl      DO NOT re-add it until they are fixed.
 	
-	CFLAGS="$CFLAGS -Os -ffast-math -fomit-frame-pointer -fschedule-insns2 -s"
+	CFLAGS="$CFLAGS -Os -ffast-math -fno-omit-frame-pointer -fschedule-insns2 -s"
 	ZSNESEXE="zsnes"
 fi
 
diff --git a/zsnes/src/linux/sw_draw.c b/zsnes/src/linux/sw_draw.c
index 3f18e348..c24cf487 100644
--- a/zsnes/src/linux/sw_draw.c
+++ b/zsnes/src/linux/sw_draw.c
@@ -57,7 +57,7 @@ BOOL sw_start(int width, int height, int req_depth, int FullScreen)
     flags |= (FullScreen ? SDL_FULLSCREEN : 0);
     
     SurfaceX = width; SurfaceY = height;
-    surface = SDL_SetVideoMode(SurfaceX, SurfaceY, 16, flags);
+    surface = SDL_SetVideoMode(SurfaceX, SurfaceY, req_depth, flags);
     if (surface == NULL) {
 	fprintf (stderr, "Could not set %dx%d video mode.\n", SurfaceX, SurfaceY);
 	return FALSE;