diff --git a/.gitignore b/.gitignore
index f11555e..9d41ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ scotch_5.1.8.tar.gz
 /scotch_5.1.10b.tar.gz
 /scotch_5.1.11.tar.gz
 /scotch_5.1.12b.tar.gz
+/scotch_6.0.0.tar.gz
diff --git a/scotch-Makefile.inc.in b/scotch-Makefile.inc.in
index 9850e23..e2a5832 100644
--- a/scotch-Makefile.inc.in
+++ b/scotch-Makefile.inc.in
@@ -9,7 +9,7 @@ CAT	= cat
 CCS	= gcc
 CCP     = mpicc
 CCD	= mpicc
-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
+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 -DSCOTCH_PTHREAD_NUMBER=2 -DSCOTCH_PTHREAD_AFFINITY_LINUX -Drestrict=__restrict
 LDFLAGS	= -lpthread -lz -lbz2 -llzmadec -lm -lrt
 CP	= cp -a
 LEX	= flex -Pscotchyy -olex.yy.c
diff --git a/scotch.spec b/scotch.spec
index 6c110e9..e1aa38c 100644
--- a/scotch.spec
+++ b/scotch.spec
@@ -1,14 +1,13 @@
 Summary:	Graph, mesh and hypergraph partitioning library
 Name:		scotch
-Version:	5.1.12
-Release:	2.b%{?dist}
+Version:	6.0.0
+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/26854/%{name}_%{version}b.tar.gz
+Source0:	https://gforge.inria.fr/frs/download.php/31831/%{name}_%{version}.tar.gz
 Source1:	scotch-Makefile.inc.in
 BuildRequires:	flex bison mpich2-devel zlib-devel bzip2-devel lzma-devel
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Scotch is a software package for graph and mesh/hypergraph partitioning and
@@ -56,9 +55,11 @@ mpicc -shared -Wl,-soname=libptscotchparmetis.so.0 -o	\
 %install
 rm -rf %{buildroot}
 pushd src/
-make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir}
+make install prefix=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} \
+             includedir=%{buildroot}%{_includedir}/%{name}-%{_arch}/
+
 popd
-cp -r include/*metis.h %{buildroot}%{_includedir}/
+cp -pr include/*metis.h %{buildroot}%{_includedir}/%{name}-%{_arch}/
 
 pushd lib
 	for static_libs in lib*scotch*.a ; do
@@ -93,9 +94,6 @@ mv -f CeCILL-C_V1-en.txt.conv CeCILL-C_V1-en.txt
 mv -f CeCILL-C_V1-fr.txt.conv CeCILL-C_V1-fr.txt
 popd
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -110,10 +108,15 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*scotch*.so
-%{_includedir}/*scotch*.h
-%{_includedir}/*metis.h
+%{_includedir}/%{name}-%{_arch}/*scotch*.h
+%{_includedir}/%{name}-%{_arch}/*metis.h
 
 %changelog
+* Thu Jun 13 2013 Deji Akingunola <dakingun@gmail.com> - 6.0.0-1
+- Update to 6.0.0
+- Configured to run with 2 threads (for now)
+- Install the headers in arch-dependent sub-directories
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.12-2.b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 576bcfe..04715fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d912599c2521b1ecbcd8d12b68eef9c  scotch_5.1.12b.tar.gz
+ba117428c0a6cd97d0c93e8b872bb3fe  scotch_6.0.0.tar.gz