diff --git a/llvm.spec b/llvm.spec
index 21d5b3e..800edad 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -328,7 +328,7 @@ Group:		Development/Other
 Requires:	clang = %{EVRD}
 # not picked up automatically since files are currently not instaled
 # in standard Python hierarchies yet
-Requires:	python
+Requires:	python2
 
 %description -n clang-analyzer
 The Clang Static Analyzer consists of both a source code analysis
@@ -377,10 +377,10 @@ export CXX=g++
 # 32 bit OSes
 %ifarch %ix86
 # compiler-rt doesn't support ix86 with x<6 either
-export CFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -g1"
+export CFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -g1 -Wno-redundant-move -fno-strict-aliasing"
 export CXXFLAGS="%{optflags} -march=i686 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fno-devirtualize -g1"
 %else
-export CXXFLAGS="%{optflags} -fno-devirtualize -g1"
+export CXXFLAGS="%{optflags} -fno-devirtualize -g1 -Wno-redundant-move -fno-strict-aliasing"
 %endif
 
 
@@ -452,3 +452,6 @@ install -D -m 0644 %{SOURCE1011} %{buildroot}%{_datadir}/clang/
 # Install libraries used for testing
 cp -a build/%{_lib}/BugpointPasses.so %{buildroot}%{_libdir}
 cp -a build/%{_lib}/LLVMHello.so %{buildroot}%{_libdir}
+
+# Versionize shebangs python
+sed '1 s,^.*$,#!%{__python3},' -i %{buildroot}%{_bindir}/{hmaptool,scan-view}