diff --git a/pexpect.spec b/pexpect.spec
index b42adbb..55067fb 100644
--- a/pexpect.spec
+++ b/pexpect.spec
@@ -1,9 +1,11 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: Expect module for Python
 Name: pexpect
 Version: 0.999
-Release: 1
+Release: 2
 License: PSFL
 Group: Development/Languages
 URL: http://pexpect.sourceforge.net
@@ -34,10 +36,14 @@ standard Python pty module.
 rm -rf $(find . -type d -name CVS)
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
-python setup.py install -O1 --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+# These are apparently works in progress and thus not installed.  But they are
+# needed by the chess* examples.... Moving them to examples for now.
+cp ANSI.py screen.py FSM.py examples
 
 #touch %{name}-ghost.files
 #for file in $(find $RPM_BUILD_ROOT -type f -name "*.py"); do
@@ -56,11 +62,22 @@ rm -rf $RPM_BUILD_ROOT
 #%files -f %{name}-ghost.files
 %files
 %defattr(-,root,root,-)
-%{_libdir}/python%{pyver}/site-packages/pexpect.*
+%{python_sitelib}/pexpect.py
+%{python_sitelib}/pexpect.pyc
+%ghost %{python_sitelib}/pexpect.pyo
 
 %doc README.txt doc examples
 
 %changelog
+* Thu Feb 03 2005 Toshio Kuratomi <toshio@tiki-lounge.com> 0.999-2
+- Use python_sitelib macro to resolve build issues on x86_64.
+- %%ghost *.pyo
+- Install ANSI.py, screen.py, and FSM.py into the examples.  These are intended 
+  to suplement pexpect eventually but they are currently much less robust and
+  not installed to by default.  But they are needed by some examples.
+- Use __python macro in build/install for consistency.
+- Add --skip-build to the invocation of setup.py in install.
+
 * Mon May 31 2004 Panu Matilainen <pmatilai@welho.com> 0.999-0.fdr.1
 - get rid of distrel munging, buildsys does that...
 - update to 0.999