diff --git a/aspell.spec b/aspell.spec
index e030306..2150b95 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -2,7 +2,7 @@ Summary: A spelling checker.
 Name: aspell
 Version: 0.33.7.1
 Epoch: 2
-Release: 16
+Release: 21
 License: LGPL
 Group: Applications/Text
 URL: http://aspell.sourceforge.net/
@@ -10,8 +10,8 @@ Source0: http://download.sourceforge.net/aspell/%{name}-.33.7.1.tar.gz
 Source1: aspell-init.el
 Patch0: aspell-.33-fix2.diff
 Patch1: aspell-.33.7.1-workaround.patch
-Requires: pspell = 2:0.12.2
-Buildrequires: pspell-devel = 2:0.12.2, gcc-c++
+Requires: pspell = 3:0.12.2
+Buildrequires: pspell-devel = 3:0.12.2, gcc-c++
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: ispell
 
@@ -67,6 +67,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 mkdir -p $RPM_BUILD_ROOT/usr/lib/xemacs/xemacs-packages/lisp/site-start.d
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+
 install -m 755 scripts/spell  $RPM_BUILD_ROOT/usr/bin/spell
 install -m 755 scripts/ispell $RPM_BUILD_ROOT/usr/bin/ispell
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
@@ -75,6 +77,9 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/xemacs/xemacs-packages/lisp/si
 cp -pr $RPM_BUILD_ROOT/usr/doc/aspell .
 rm -f aspell/manual.aux
 
+# remove the doc stuff we don't want packaged
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -85,13 +90,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README TODO aspell/*
-/usr/bin/*
-/usr/lib/aspell/american*
-/usr/lib/aspell/english*
-/usr/lib/lib*.so.*
+%{_bindir}/*
+%{_libdir}/aspell/american*
+%{_libdir}/aspell/english*
+%{_libdir}/lib*.so.*
 # Yes, they need to be in the main package - they are used for
 # dynamic loading. Argh.
-/usr/lib/lib*.la
+%{_libdir}/lib*.la
 /usr/share/aspell
 /usr/share/pspell
 /usr/share/emacs/site-lisp/site-start.d/*
@@ -100,18 +105,27 @@ rm -rf $RPM_BUILD_ROOT
 %files		devel
 %defattr(-,root,root)
 /usr/include/aspell
-/usr/lib/lib*aspell.a
-/usr/lib/lib*aspell.so
+%{_libdir}/lib*aspell.a
+%{_libdir}/lib*aspell.so
 
 %files en-ca
 %defattr(-,root,root)
-/usr/lib/aspell/canadian*
+%{_libdir}/aspell/canadian*
 
 %files en-gb
 %defattr(-,root,root)
-/usr/lib/aspell/british*
+%{_libdir}/aspell/british*
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Fri Nov  8 2002 Tim Powers <timp@redhat.com>
+- fix broken pspell epoch dep
+- create $RPM_BUILD_ROOT/usr/bin by hand
+- remove /usr/doc
+- fix hardcoding of /usr/lib so that we can build on x86_64
+
 * Tue Aug 13 2002 Nalin Dahyabhai <nalin@redhat.com> 0.33.7.1-16
 - require pspell and pspell-devel using the proper epoch