diff --git a/sc2/content/base/ui/setupmenu.txt b/sc2/content/base/ui/setupmenu.txt
index 65f4a503e..fb469baf6 100644
--- a/sc2/content/base/ui/setupmenu.txt
+++ b/sc2/content/base/ui/setupmenu.txt
@@ -40,27 +40,26 @@ UQM Remixes
 640x480
 800x600
 1024x768
+1280x960
 Custom
 
 #(CAT_0_OPT_0_DESC)
 320x240 resolution.
-Available with SDL framebuffer or OpenGL.
 
 #(CAT_0_OPT_1_DESC)
 640x480 resolution.
-Available with SDL framebuffer or OpenGL.
 
 #(CAT_0_OPT_2_DESC)
 800x600 resolution.
-Requires OpenGL graphics drivers.
 
 #(CAT_0_OPT_3_DESC)
 1024x768 resolution.
-Requires OpenGL graphics drivers.
 
 #(CAT_0_OPT_4_DESC)
+1280x960 resolution.
+
+#(CAT_0_OPT_5_DESC)
 Custom resolution set from the commandline.
-Requires OpenGL graphics drivers.
 
 #(CAT_1_OPTS)
 If Possible
diff --git a/sc2/src/uqm/setupmenu.c b/sc2/src/uqm/setupmenu.c
index 26f91c721..1da42d3b3 100644
--- a/sc2/src/uqm/setupmenu.c
+++ b/sc2/src/uqm/setupmenu.c
@@ -189,7 +189,7 @@ number_res_options (void)
 {
 	if (TFB_SupportsHardwareScaling ())
 	{
-		return 4;
+		return 5;
 	}
 	else
 	{
@@ -1185,6 +1185,16 @@ GetGlobalOptions (GLOBALOPTS *opts)
 			opts->res = OPTVAL_1024_768;
 		}		
 		break;
+	case 1280:
+		if (ScreenHeightActual != 960)
+		{
+			opts->res = OPTVAL_CUSTOM;
+		}
+		else
+		{
+			opts->res = OPTVAL_1280_960;
+		}
+		break;
 	default:
 		opts->res = OPTVAL_CUSTOM;
 		break;
@@ -1250,6 +1260,11 @@ SetGlobalOptions (GLOBALOPTS *opts)
 		NewHeight = 768;
 		NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
 		break;
+	case OPTVAL_1280_960:
+		NewWidth = 1280;
+		NewHeight = 960;
+		NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
+		break;
 	default:
 		/* Don't mess with the custom value */
 		break;
diff --git a/sc2/src/uqm/setupmenu.h b/sc2/src/uqm/setupmenu.h
index 41dbcc260..9b0a48eba 100644
--- a/sc2/src/uqm/setupmenu.h
+++ b/sc2/src/uqm/setupmenu.h
@@ -45,6 +45,7 @@ typedef enum {
 	OPTVAL_640_480,
 	OPTVAL_800_600,
 	OPTVAL_1024_768,
+	OPTVAL_1280_960,
 	OPTVAL_CUSTOM
 } OPT_RESTYPE;