diff --git a/.cvsignore b/.cvsignore
index d3065d4..afc444d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-scotch_5.1.7.tar.gz
+scotch_5.1.8.tar.gz
diff --git a/scotch-Makefile.inc.in b/scotch-Makefile.inc.in
index 156d547..3a75499 100644
--- a/scotch-Makefile.inc.in
+++ b/scotch-Makefile.inc.in
@@ -9,8 +9,8 @@ CAT	= cat
 CCS	= gcc
 CCP     = mpicc
 CCD	= mpicc
-CFLAGS	= @RPMFLAGS@ -O3 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
-LDFLAGS	= -lpthread -lz -lm -lrt
+CFLAGS	= @RPMFLAGS@ -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_FILE_COMPRESS_BZ2 -DCOMMON_FILE_COMPRESS_LZMA -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
+LDFLAGS	= -lpthread -lz -lbz2 -llzmadec -lm -lrt
 CP	= cp -a
 LEX	= flex
 LN	= ln
diff --git a/scotch.spec b/scotch.spec
index 97d977b..fc2994d 100644
--- a/scotch.spec
+++ b/scotch.spec
@@ -1,13 +1,13 @@
 Summary:	Graph, mesh and hypergraph partitioning library
 Name:		scotch
-Version:	5.1.7
-Release:	2%{?dist}
+Version:	5.1.8
+Release:	1%{?dist}
 License:	CeCILL-C
 Group:		Development/Libraries
 URL:		http://www.labri.fr/perso/pelegrin/scotch/
-Source0:	http://gforge.inria.fr/frs/download.php/23390/%{name}_%{version}.tar.gz
+Source0:	http://gforge.inria.fr/frs/download.php/26854/%{name}_%{version}.tar.gz
 Source1:	scotch-Makefile.inc.in
-BuildRequires:	flex bison mpich2-devel zlib-devel
+BuildRequires:	flex bison mpich2-devel zlib-devel bzip2-devel lzma-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -31,7 +31,7 @@ Requires:	%{name}-devel = %{version}-%{release}
 This package contains libscotch static libraries.
 
 %prep
-%setup -q -n scotch_5.1
+%setup -q -n scotch_%{version}
 sed s/@RPMFLAGS@/'%{optflags} -fPIC'/ < %SOURCE1 > src/Makefile.inc
 
 %build
@@ -43,10 +43,11 @@ gcc -shared -Wl,-soname=libscotcherrexit.so.0 -o	\
 	../lib/libscotcherrexit.so.0.0	libscotch/library_error_exit.o
 rm -f libscotch/library_error*.o
 gcc -shared -Wl,-soname=libscotch.so.0 -o ../lib/libscotch.so.0.0	\
-	libscotch/*.o ../lib/libscotcherr.so.0.0 -lpthread -lgfortran -lz -lrt
+	libscotch/*.o ../lib/libscotcherr.so.0.0 -lpthread -lgfortran -lz -lbz2 -llzmadec -lrt
 gcc -shared -Wl,-soname=libscotchmetis.so.0 -o ../lib/libscotchmetis.so.0.0\
-	libscotchmetis/*.o ../lib/libscotch.so.0.0 ../lib/libscotcherr.so.0.0 -lz -lm -lrt
+	libscotchmetis/*.o ../lib/libscotch.so.0.0 ../lib/libscotcherr.so.0.0
 
+%{_mpich2_load}
 make %{?_smp_mflags} ptscotch
 mpicc -shared -Wl,-soname=libptscotcherr.so.0 -o ../lib/libptscotcherr.so.0.0\
 	libscotch/library_error.o
@@ -54,10 +55,11 @@ mpicc -shared -Wl,-soname=libptscotcherrexit.so.0 -o	\
 	../lib/libptscotcherrexit.so.0.0  libscotch/library_error_exit.o
 rm -f libscotch/library_error*.o
 mpicc -shared -Wl,-soname=libptscotch.so.0 -o ../lib/libptscotch.so.0.0	\
-	libscotch/*.o ../lib/libptscotcherr.so.0.0 -lgfortran -lz 
+	libscotch/*.o ../lib/libptscotcherr.so.0.0 -lgfortran -lz -lbz2 -llzmadec
 mpicc -shared -Wl,-soname=libptscotchparmetis.so.0 -o	\
 	../lib/libptscotchparmetis.so.0.0 libscotchmetis/*.o	\
-	../lib/libptscotch.so.0.0 ../lib/libptscotcherr.so.0.0 -lz -lm -lrt
+	../lib/libptscotch.so.0.0 ../lib/libptscotcherr.so.0.0
+%{_mpich2_unload}
 
 %install
 rm -rf %{buildroot}
@@ -119,6 +121,9 @@ rm -rf %{buildroot}
 %{_libdir}/lib*scotch*.a
 
 %changelog
+* Tue Apr 27 2010 Deji Akingunola <dakingun@gmail.com> - 5.1.8-1
+- Update to 5.1.8
+
 * Wed Nov 04 2009 Deji Akingunola <dakingun@gmail.com> - 5.1.7-2
 - Fix the Source url
 
diff --git a/sources b/sources
index bc34fe1..dfcbb0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3d82ea9ad83ec8d26994fb36ebdc713  scotch_5.1.7.tar.gz
+a22e1ae0015375fa0cc8fc3ee033b8ad  scotch_5.1.8.tar.gz