diff --git a/avogadro.spec b/avogadro.spec
index 7fafa6e..e3ad969 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,3 +1,5 @@
+%{!?python_sitelib:%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define ENABLE_TESTS -DENABLE_TESTS:BOOL=ON
 
@@ -10,6 +12,7 @@ Group:          Applications/Editors
 License:        GPLv2
 URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  qt4-devel >= 4.5.1
@@ -69,6 +72,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
@@ -83,6 +87,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
 
 %postun libs -p /sbin/ldconfig
 
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING
@@ -121,7 +130,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/avogadro.desktop
 %changelog
 * Wed Aug 04 2010 Rahul Sundaram <sundaram@fedoraproject.org> - 1.0.1-3
 - Rebuild for Boost soname bump
-- Update to match current guidelines
 
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild