diff --git a/cracklib.spec b/cracklib.spec
index 7624c13..9e29c75 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -41,7 +41,7 @@ Patch2: cracklib-2.7-check.patch
 Patch3: cracklib-2.7-64.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: gzip, words
-Requires: cracklib-dicts = %{version}-%{release}
+Requires: cracklib-dicts@%{_arch} = %{version}-%{release}
 
 %description
 CrackLib tests passwords to determine whether they match certain
@@ -64,7 +64,9 @@ CrackLib, you will also want to install the cracklib-dicts package.
 %package dicts
 Summary: The standard CrackLib dictionaries.
 Group: System Environment/Libraries
-Requires: words >= 2-13
+BuildRequires: words >= 2-13
+# Note to other packagers: do NOT require this, it will eventually go away.
+Provides: cracklib-dicts@%{_arch} = %{version}-%{release}
 
 %description dicts
 The cracklib-dicts package includes the CrackLib dictionaries.
@@ -134,12 +136,15 @@ make install \
 - rebuild
 
 * Mon Jan  3 2005 Nalin Dahyabhai <nalin@redhat.com> 2.7-29
-- correctly build on 64-bit systems
+- correctly build on 64-bit systems (part of #143417)
 - patch so that 32- and 64-bit libcrack can read dictionaries which were
-  incorrectly generated on 64-bit systems of the same endianness
+  incorrectly generated on 64-bit systems of the same endianness (more #143417)
 - include a sample cracklib magic file
-- require cracklib-dicts
 - stop using /usr/dict/* when building the dictionary
+- list words as a build requirement, which it is, instead of a run-time
+  requirement
+- provide a virtual arch-specific dep in cracklib-dicts, require it in
+  cracklib (part of #143417)
 
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt