diff --git a/llvm.changes b/llvm.changes
index b3c5426..c2a43c8 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  2 12:22:07 UTC 2011 - idoenmez@suse.de
+
+- Build first stage compiler with -O0 to workaround gcc 4.5 bug 
+
 -------------------------------------------------------------------
 Thu Dec  1 18:04:15 UTC 2011 - idoenmez@suse.de
 
diff --git a/llvm.spec b/llvm.spec
index 967fc94..d87af28 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -142,10 +142,13 @@ TOPLEVEL=$PWD
 mkdir stage1 stage2
 cd stage1
 
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DLLVM_ENABLE_ASSERTIONS=FALSE \
-      -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
-      ..
+# Idiot cmake doesn't let me select my own optimization level here
+# hence we use configure, this needed to workaround a gcc 4.5 bug
+../configure \
+    --enable-optimized \
+    --disable-assertions \
+    --with-optimize-option="-O0" \
+    --enable-targets=host
 
 make %{?_smp_mflags}
 
@@ -153,8 +156,8 @@ cd ../stage2
 # Needed to make clang resource dir working inside build tree
 ln -s lib lib64
 
-export CC=$TOPLEVEL/stage1/bin/clang
-export CXX=$TOPLEVEL/stage1/bin/clang++
+export CC=$TOPLEVEL/stage1/Release/bin/clang
+export CXX=$TOPLEVEL/stage1/Release/bin/clang++
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DCMAKE_BUILD_TYPE=Release \