diff -up ./build.old ./build
--- ./build.old	2011-01-27 16:46:40.000000000 -0500
+++ ./build	2012-01-31 18:01:09.482983189 -0500
@@ -25,8 +25,7 @@ build_splat()
 	fi
 
 	echo -n "Compiling SPLAT!... "
-	g++ -Wall -O2 -fomit-frame-pointer -ffast-math -pipe -march=$cpu $model itwom3.0.cpp splat.cpp -lm -lbz2 -o splat
-
+	g++ -ffast-math $RPM_OPT_FLAGS itwom3.0.cpp splat.cpp -lm -lbz2 -o splat
 	if [ -x splat ]; then
 		echo "Done!"
 	else
@@ -36,7 +35,7 @@ build_splat()
 	if [ -r hd-parms.h ]; then
 		cp hd-parms.h splat.h
 		echo -n "Compiling SPLAT! HD... "
-		g++ -Wall -O2 -fomit-frame-pointer -ffast-math -pipe -march=$cpu $model itwom3.0.cpp splat.cpp -lm -lbz2 -o splat-hd
+		g++ -ffast-math $RPM_OPT_FLAGS itwom3.0.cpp splat.cpp -lm -lbz2 -o splat
 
 		if [ -x splat-hd ]; then
 			echo "Done!"
diff -up ./utils/build.old ./utils/build
--- ./utils/build.old	2009-09-09 14:17:09.000000000 -0400
+++ ./utils/build	2012-01-31 17:15:46.420975938 -0500
@@ -7,7 +7,7 @@
 build_citydecoder()
 {
 	echo -n "Compiling citydecoder... "
-	cc -Wall -O2 -fomit-frame-pointer citydecoder.c -o citydecoder
+	cc $RPM_OPT_FLAGS -fomit-frame-pointer citydecoder.c -o citydecoder
 
 	if [ -x citydecoder ]; then
 		echo "Done!"
@@ -19,7 +19,7 @@ build_citydecoder()
 build_usgs2sdf()
 {
 	echo -n "Compiling usgs2sdf... "
-	cc -Wall -O2 -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
+	cc $RPM_OPT_FLAGS -fomit-frame-pointer usgs2sdf.c -o usgs2sdf
 
 	if [ -x usgs2sdf ]; then
 		echo "Done!"
@@ -31,7 +31,7 @@ build_usgs2sdf()
 build_srtm2sdf()
 {
 	echo -n "Compiling srtm2sdf... "
-	cc -Wall -O2 -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
+	cc $RPM_OPT_FLAGS -fomit-frame-pointer srtm2sdf.c -lbz2 -o srtm2sdf
 	rm -f srtm2sdf-hd
 	ln -s srtm2sdf srtm2sdf-hd
 
@@ -46,7 +46,7 @@ build_srtm2sdf()
 build_fontdata()
 {
 	echo -n "Compiling fontdata... "
-	cc -Wall -O2 -lz -fomit-frame-pointer fontdata.c -o fontdata
+	cc $RPM_OPT_FLAGS -lz -fomit-frame-pointer fontdata.c -o fontdata
 
 	if [ -x fontdata ]; then
 		echo "Done!"
@@ -59,7 +59,7 @@ build_fontdata()
 build_bearing()
 {
 	echo -n "Compiling bearing... "
-	cc -Wall -O2 -fomit-frame-pointer -lm bearing.c -o bearing
+	cc $RPM_OPT_FLAGS -fomit-frame-pointer -lm bearing.c -o bearing
 
 	if [ -x bearing ]; then
 		echo "Done!"