diff --git a/llvm.spec b/llvm.spec
index 841c5e7..01dcc4f 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -12,7 +12,7 @@
 
 Name:           llvm
 Version:        2.8
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        The Low Level Virtual Machine
 
 Group:          Development/Languages
@@ -86,7 +86,7 @@ Summary:        A C language family front-end for LLVM
 License:        NCSA
 Group:          Development/Languages
 # clang requires gcc; clang++ gcc-c++
-Requires:	gcc-c++
+Requires:       gcc-c++
 
 %description -n clang
 clang: noun
@@ -225,7 +225,8 @@ popd
   --with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \
       -maxdepth 0 -type d)/include \
   --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \
-  --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os}
+  --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \
+  --with-cxx-include-32bit-dir=32
 
 # FIXME file this
 # configure does not properly specify libdir
@@ -400,6 +401,18 @@ find examples -name 'Makefile' | xargs -0r rm -f
 
 
 %changelog
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-9
+- clang++: fix platform-specific include dirs (# 680644)
+
+* Thu Mar 17 2011 Michel Salim <salimma@fedoraproject.org> - 2.8-8
+- clang++: also search for platform-specific include files (# 680644)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 10 2011 Richard W.M. Jones <rjones@redhat.com> - 2.8-6
+- Rebuild for OCaml 3.12 (http://fedoraproject.org/wiki/Features/OCaml3.12).
+
 * Sat Nov 27 2010 Michel Salim <salimma@fedoraproject.org> - 2.8-5
 - clang now requires gcc-c++ for linking and headers (bug #654560)