diff -Naur uqm-0.6.2/sc2/build/unix/build.config uqm-0.6.2.new/sc2/build/unix/build.config
--- uqm-0.6.2/sc2/build/unix/build.config	2007-01-24 16:43:49.000000000 +0100
+++ uqm-0.6.2.new/sc2/build/unix/build.config	2007-01-24 16:44:29.000000000 +0100
@@ -90,7 +90,7 @@
 	CHOICE_debug_OPTION_nodebug_TITLE="Optimised release build"
 	CHOICE_debug_OPTION_nodebug_ACTION='nodebug_action'
 	nodebug_action() {
-		CFLAGS="$CFLAGS -O3"
+		CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 		DEBUG=0
 	}
 	CHOICE_debug_OPTION_debug_TITLE="Debugging build"
diff -Naur uqm-0.6.2/sc2/build/unix/config_proginfo_host uqm-0.6.2.new/sc2/build/unix/config_proginfo_host
--- uqm-0.6.2/sc2/build/unix/config_proginfo_host	2007-01-24 16:43:49.000000000 +0100
+++ uqm-0.6.2.new/sc2/build/unix/config_proginfo_host	2007-01-24 16:44:29.000000000 +0100
@@ -137,7 +137,14 @@
 		;;
 	*)
 		LIB_opengl_CFLAGS=""
-		LIB_opengl_LDFLAGS="-lGL"
+		case `arch` in
+			x86_64)
+				LIB_opengl_LDFLAGS="-L/usr/X11R6/lib64 -lGL"
+				;;
+			*)
+				LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lGL"
+				;;
+		esac
 		;;
 esac
 LIB_opengl_VERSION=""
--- uqm-0.6.2/sc2/src/sc2code/gameopt.c	2006-12-23 11:26:09.000000000 +0100
+++ uqm-0.6.2/sc2/src/sc2code/gameopt.c.fix	2010-06-10 01:17:47.000000000 +0200
@@ -1149,7 +1149,7 @@
 
 				t.baseline.x = r.corner.x + 3;
 				if (((SUMMARY_DESC *)pMS->Extra)[NewState - SHIFT + i].year_index == 0)
-					sprintf (buf, GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
+					sprintf (buf, "%s",GAME_STRING (SAVEGAME_STRING_BASE + 3)); // "Empty Slot"
 				else
 				{
 					DateToString (buf2, sizeof buf2,