diff --git a/rust.spec b/rust.spec
index fbd5bbb..8d81752 100644
--- a/rust.spec
+++ b/rust.spec
@@ -36,8 +36,6 @@
 %global _arch i586
 %endif
 %global rust_triple %{_arch}-unknown-linux-%{abi}
-# to bootstrap, change to bcond_without
-%bcond_with bootstrap
 Name:           rust
 Version:        1.15.0
 Release:        0
@@ -159,6 +157,7 @@ rm %{buildroot}%{_prefix}/lib/rustlib/components
 rm %{buildroot}%{_prefix}/lib/rustlib/manifest-rust*
 rm %{buildroot}%{_prefix}/lib/rustlib/install.log
 rm %{buildroot}%{_prefix}/lib/rustlib/uninstall.sh
+rm %{buildroot}%{_prefix}/lib/rustlib/rust-installer-version
 # Remove lockfile to avoid errors.
 rm %{buildroot}%{_docdir}/%{name}/html/.lock
 
@@ -187,9 +186,8 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
 %{_bindir}/rustdoc
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
-%{_prefix}/lib/lib*
-%exclude %{_docdir}
-%exclude %{_prefix}/lib/rustlib
+%{_prefix}/lib/lib*.so
+%exclude %{_docdir}/%{name}/html
 
 %files std
 %defattr(-,root,root)
@@ -197,15 +195,16 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
 %dir %{_prefix}/lib/rustlib/%{rust_triple}
 %dir %{_prefix}/lib/rustlib/%{rust_triple}/lib
 %{_prefix}/lib/rustlib/%{rust_triple}/lib/*.rlib
+%{_prefix}/lib/rustlib/%{rust_triple}/lib/*.so 
 
 %files gdb
 %defattr(-,root,root,-)
 %{_bindir}/rust-gdb
 %dir %{_prefix}/lib/rustlib
 %dir %{_prefix}/lib/rustlib/etc
-%{_prefix}/lib/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py
-%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py
-%{_prefix}/lib/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py
+%{_prefix}/lib/rustlib/etc/debugger_pretty_printers_common.py
+%{_prefix}/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+%{_prefix}/lib/rustlib/etc/gdb_rust_pretty_printing.py
 
 %files doc
 %defattr(-,root,root)
@@ -235,4 +234,4 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
 %doc %{_docdir}/%{name}/html/*.js
 %doc %{_docdir}/%{name}/html/*.css
 
-%changelog
\ No newline at end of file
+%changelog