diff --git a/cracklib.spec b/cracklib.spec
index 1cc52f2..ca44465 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,7 +1,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.7
-Release: 28
+Release: 29
 Group: System Environment/Libraries
 Source0: http://www.crypticide.org/users/alecm/security/cracklib,%{version}.tgz
 Source1: crack.h
@@ -32,12 +32,16 @@ Source33: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.french.gz
 Source34: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.hp.gz
 Source35: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/other-names.gz
 Source36: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish.gz
+Source37: cracklib.magic
 Url: http://www.crypticide.org/users/alecm/
 License: Artistic
 Patch0: cracklib-2.7-rh.patch
 Patch1: cracklib-2.7-nss.patch
+Patch2: cracklib-2.7-check.patch
+Patch3: cracklib-2.7-64.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: gzip, words
+Requires: cracklib-dicts = %{version}-%{release}
 
 %description
 CrackLib tests passwords to determine whether they match certain
@@ -74,6 +78,8 @@ If you are installing CrackLib, you should also install cracklib-dicts.
 %setup -n cracklib,%{version} -q
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .nss
+%patch2 -p1 -b .check
+%patch3 -p1 -b .64
 cp %{SOURCE1} cracklib/crack.h
 mkdir cracklib-dicts
 for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
@@ -114,7 +120,7 @@ make install \
 
 %files
 %defattr(-,root,root)
-%doc README MANIFEST LICENCE HISTORY POSTER
+%doc README MANIFEST LICENCE HISTORY POSTER $RPM_SOURCE_DIR/cracklib.magic
 %{_includedir}/*
 %{_libdir}/lib*
 
@@ -124,6 +130,14 @@ make install \
 %{_libdir}/cracklib_dict*
 
 %changelog
+* Mon Jan  3 2005 Nalin Dahyabhai <nalin@redhat.com> 2.7-29
+- correctly build on 64-bit systems
+- patch so that 32- and 64-bit libcrack can read dictionaries which were
+  incorrectly generated on 64-bit systems of the same endianness
+- include a sample cracklib magic file
+- require cracklib-dicts
+- stop using /usr/dict/* when building the dictionary
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt