diff --git a/rust.spec b/rust.spec
index 453219b..4105579 100644
--- a/rust.spec
+++ b/rust.spec
@@ -131,7 +131,6 @@ invoking gdb on rust binaries.
 
 %build
 export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
-# FIXME: you should use the %%configure macro
 %configure --disable-option-checking \
     --build=%{rust_triple} \
     --host=%{rust_triple} \
@@ -139,7 +138,7 @@ export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
     --enable-local-rust \
     --local-rust-root=%{_prefix} \
     --prefix=%{_prefix} \
-    --libdir=%{_libdir} \
+    --libdir=%{_prefix}/lib \
     --docdir=%{_docdir}/%{name} \
     --disable-rpath \
     --disable-codegen-tests \
@@ -156,15 +155,15 @@ make %{?_smp_mflags}
 chmod -R -x+X %{buildroot}%{_docdir}/%{name}/html
 
 # Remove surplus files
-rm %{buildroot}%{_libdir}/rustlib/components
-rm %{buildroot}%{_libdir}/rustlib/manifest-rust*
-rm %{buildroot}%{_libdir}/rustlib/install.log
-rm %{buildroot}%{_libdir}/rustlib/uninstall.sh
+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
 # Remove lockfile to avoid errors.
 rm %{buildroot}%{_docdir}/%{name}/html/.lock
 
 # The remaining shared libraries should be executable for debuginfo extraction.
-find %{buildroot}/%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
+find %{buildroot}/%{_prefix}/lib/ -type f -name '*.so' -exec chmod -v +x '{}' '+'
 
 # extract bundled licenses for packaging - From fedora spec
 cp src/rt/hoedown/LICENSE src/rt/hoedown/LICENSE-hoedown
@@ -188,25 +187,25 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
 %{_bindir}/rustdoc
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
-%{_libdir}/lib*
+%{_prefix}/lib/lib*
 %exclude %{_docdir}
-%exclude %{_libdir}/rustlib
+%exclude %{_prefix}/lib/rustlib
 
 %files std
 %defattr(-,root,root)
-%dir %{_libdir}/rustlib
-%dir %{_libdir}/rustlib/%{rust_triple}
-%dir %{_libdir}/rustlib/%{rust_triple}/lib
-%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib
+%dir %{_prefix}/lib/rustlib
+%dir %{_prefix}/lib/rustlib/%{rust_triple}
+%dir %{_prefix}/lib/rustlib/%{rust_triple}/lib
+%{_prefix}/lib/rustlib/%{rust_triple}/lib/*.rlib
 
 %files gdb
 %defattr(-,root,root,-)
 %{_bindir}/rust-gdb
-%dir %{_libdir}/rustlib
-%dir %{_libdir}/rustlib/etc
-%{_libdir}/rustlib%{_sysconfdir}/debugger_pretty_printers_common.py
-%{_libdir}/rustlib%{_sysconfdir}/gdb_load_rust_pretty_printers.py
-%{_libdir}/rustlib%{_sysconfdir}/gdb_rust_pretty_printing.py
+%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
 
 %files doc
 %defattr(-,root,root)