diff --git a/lapack.spec b/lapack.spec
index c76ac56..47eab8b 100644
--- a/lapack.spec
+++ b/lapack.spec
@@ -1,7 +1,7 @@
 Summary: Numerical linear algebra package libraries
 Name: lapack
 Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL: http://www.netlib.org/lapack/
@@ -87,12 +87,9 @@ popd
 
 ln -s libblas.so.%{version} libblas.so
 
-# Some files don't like -O2, but -Os is fine
-RPM_OPT_SIZE_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's|-O2|-Os|')
-
 # Build the static dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
-make NOOPT="$RPM_OPT_SIZE_FLAGS" OPTS="$RPM_OPT_FLAGS"
+make NOOPT="$RPM_OPT_O_FLAGS" OPTS="$RPM_OPT_FLAGS"
 popd
 
 # Build the static lapack library
@@ -101,23 +98,10 @@ make FFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" static
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/
 popd
 
-# Build the shared dlamch, dsecnd, lsame, second, slamch bits
+# Build the static with pic dlamch, dsecnd, lsame, second, slamch bits
 pushd INSTALL
 make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
-popd
-
-# Build the shared lapack library
-pushd SRC
-make clean
-make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
-cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
-popd
-
-# Buuld the static with pic dlamch, dsecnd, lsame, second, slamch bits
-pushd INSTALL
-make clean
-make NOOPT="$RPM_OPT_SIZE_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
 popd
 
 # Build the static with pic lapack library
@@ -127,6 +111,19 @@ make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" static
 cp liblapack.a ${RPM_BUILD_DIR}/%{name}-%{version}/liblapack_pic.a
 popd
 
+# Build the shared dlamch, dsecnd, lsame, second, slamch bits
+pushd INSTALL
+make clean
+make NOOPT="$RPM_OPT_O_FLAGS -fPIC" OPTS="$RPM_OPT_FLAGS -fPIC"
+popd
+
+# Build the shared lapack library
+pushd SRC
+make clean
+make FFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC" shared
+cp liblapack.so.%{version} ${RPM_BUILD_DIR}/%{name}-%{version}/
+popd
+
 cp -p %{SOURCE4} lapackqref.ps
 cp -p %{SOURCE5} blasqr.ps
 
@@ -189,6 +186,9 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/libblas*.a
 
 %changelog
+* Fri Sep  4 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.2.1-3
+- use RPM_OPT_O_FLAGS (-O0) everywhere necessary, drop RPM_OPT_SIZE_FLAGS (-Os) (bz 520518)
+
 * Thu Aug 20 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.2.1-2
 - don't enable xblas yet