diff --git a/cracklib.spec b/cracklib.spec
index cbb652a..d427604 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,7 +1,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.7
-Release: 11
+Release: 12
 Group: System Environment/Libraries
 Source0: http://www.users.dircon.co.uk/~crypto/download/cracklib,%{version}.tgz
 Source1: crack.h
@@ -34,31 +34,27 @@ 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
 Url: http://www.users.dircon.co.uk/~crypto/
 Copyright: Artistic
-Patch: cracklib-2.7-2-redhat.patch
+Patch: cracklib-2.7-rh.patch
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: gzip
+BuildPrereq: gzip, words
 
 %description
 CrackLib tests passwords to determine whether they match certain
-security-oriented characteristics. You can use CrackLib to stop
-users from choosing passwords which would be easy to guess. CrackLib
-performs certain tests: 
+security-oriented characteristics, with the purpose of stopping users
+from choosing passwords that are easy to guess. CrackLib performs
+several tests on passwords: it tries to generate words from a username
+and gecos entry and checks those words against the password; it checks
+for simplistic patterns in passwords; and it checks for the password
+in a dictionary.
 
-* It tries to generate words from a username and gecos entry and 
-  checks those words against the password;
-* It checks for simplistic patterns in passwords;
-* It checks for the password in a dictionary.
-
-CrackLib is actually a library containing a particular
-C function which is used to check the password, as well as
-other C functions. CrackLib is not a replacement for a passwd
-program; it must be used in conjunction with an existing passwd
-program.
+CrackLib is actually a library containing a particular C function
+which is used to check the password, as well as other C
+functions. CrackLib is not a replacement for a passwd program; it must
+be used in conjunction with an existing passwd program.
 
 Install the cracklib package if you need a program to check users'
-passwords to see if they are at least minimally secure. If you
-install CrackLib, you'll also want to install the cracklib-dicts
-package.
+passwords to see if they are at least minimally secure. If you install
+CrackLib, you will also want to install the cracklib-dicts package.
 
 %package dicts
 Summary: The standard CrackLib dictionaries.
@@ -68,8 +64,8 @@ Requires: words >= 2-13
 %description dicts
 The cracklib-dicts package includes the CrackLib dictionaries.
 CrackLib will need to use the dictionary appropriate to your system,
-which is normally put in /usr/share/dict/words.  Cracklib-dicts also contains
-the utilities necessary for the creation of new dictionaries.
+which is normally put in /usr/share/dict/words. Cracklib-dicts also
+contains the utilities necessary for the creation of new dictionaries.
 
 If you are installing CrackLib, you should also install cracklib-dicts.
 
@@ -103,8 +99,6 @@ make install \
 	includedir=%{_includedir} \
 	libdir=%{_libdir} \
 	sbindir=%{_sbindir}
-strip $RPM_BUILD_ROOT%{_sbindir}/packer
-ln -sf libcrack.so.2.7 $RPM_BUILD_ROOT%{_libdir}/libcrack.so.2
 
 %post -p /sbin/ldconfig
 
@@ -122,6 +116,12 @@ ln -sf libcrack.so.2.7 $RPM_BUILD_ROOT%{_libdir}/libcrack.so.2
 %{_libdir}/cracklib_dict*
 
 %changelog
+* Fri Aug  3 2001 Nalin Dahyabhai <nalin@redhat.com>
+- remove cruft that ldconfig already knows how to manage
+- don't explicitly strip anything -- the brp setup decides that
+- tweak the header so that it can be used in C++ (#46685)
+- buildprereq the words package
+
 * Tue Jun 26 2001 Florian La Roche <Florian.LaRoche@redhat.de>
 - add link from library major version number
 
@@ -163,4 +163,3 @@ ln -sf libcrack.so.2.7 $RPM_BUILD_ROOT%{_libdir}/libcrack.so.2
 
 * Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
 - built against glibc
-