diff --git a/scalapack.spec b/scalapack.spec
index f8ab159..0afa7d1 100644
--- a/scalapack.spec
+++ b/scalapack.spec
@@ -1,20 +1,3 @@
-# These macros will go away soon. Hopefully.
-%global _openmpi_load \
- . /etc/profile.d/modules.sh; \
- module load openmpi-%{_arch}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _openmpi_unload \
- . /etc/profile.d/modules.sh; \
- module unload openmpi-%{_arch};
-
-%global _mpich2_load \
- . /etc/profile.d/modules.sh; \
- module load mpich2-%{__isa_bits}; \
- export CFLAGS="$CFLAGS %{optflags}";
-%global _mpich2_unload \
- . /etc/profile.d/modules.sh; \
- module unload mpich2-%{__isa_bits};
-
 # The blacs packages should probably provide these.
 %global _blacs_openmpi_load \
  . /etc/profile.d/modules.sh; \
@@ -35,7 +18,7 @@
 Summary: A subset of LAPACK routines redesigned for heterogenous computing
 Name: scalapack
 Version: 1.7.5
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 # This is freely distributable without any restrictions.
 License: Public Domain
 Group: Development/Libraries
@@ -107,7 +90,7 @@ This package contains common files which are not specific to any MPI implementat
 %package mpich2
 Summary: ScaLAPACK libraries compiled against mpich2
 Group: Development/Libraries
-BuildRequires: blacs-mpich2-devel, mpich2-devel
+BuildRequires: blacs-mpich2-devel, mpich2-devel-static
 Requires: %{name}-common = %{version}-%{release}
 Requires: environment-modules
 # This is a lie, but something needs to obsolete it.
@@ -217,7 +200,7 @@ This package contains static libraries for ScaLAPACK, compiled against openmpi.
 cd %{name}-%{version}/
 sed -i 's!BLACSdir      =.*!BLACSdir      = %{_libdir}!' SLmake.inc
 cd ..
-for i in lam mpich2 openmpi; do
+for i in mpich2 openmpi; do
   cp -a %{name}-%{version} %{name}-%{version}-$i
   sed -i "s|FOO|$i|g" %{name}-%{version}-$i/SLmake.inc
 done
@@ -318,6 +301,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/scalapack-openmpi/libscalapack.a
 
 %changelog
+* Wed Dec 15 2009 Deji Akingunola <dakingun@gmail.com> - 1.7.5-8.1
+- mpich2 and openmpi macros can now be sanely removed
+- Buildrequire mpich2-devel-static and rebuild for mpich2-1.2.1
+
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 1.7.5-8
 - drop lam support (Provides/Obsoletes by mpich2, which is a hack, but something's gotta do it)
 - move static libs to static subpackages (resolves bz 545150)