diff --git a/.cvsignore b/.cvsignore
index 52de449..c7d4684 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -33,3 +33,4 @@ cracklib-2.8.3.tar.gz
 cracklib-2.8.4.tar.gz
 cracklib-2.8.5.tar.gz
 cracklib-2.8.6.tar.gz
+cracklib-2.8.9.tar.gz
diff --git a/cracklib.spec b/cracklib.spec
index 785e8b5..f03afcf 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -3,8 +3,8 @@
 
 Summary: A password-checking library.
 Name: cracklib
-Version: 2.8.6
-Release: 1.2.1
+Version: 2.8.9
+Release: 2
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
@@ -110,9 +110,11 @@ while ! test -f $RPM_BUILD_ROOT/%{_libdir}/$toprelpath/top ; do
 	toprelpath=../$toprelpath
 done
 rm -f $RPM_BUILD_ROOT/top
+if test %{dictpath} != %{_libdir}/cracklib_dict ; then
 ln -s $toprelpath%{dictpath}.hwm $RPM_BUILD_ROOT/%{_libdir}/cracklib_dict.hwm
 ln -s $toprelpath%{dictpath}.pwd $RPM_BUILD_ROOT/%{_libdir}/cracklib_dict.pwd
 ln -s $toprelpath%{dictpath}.pwi $RPM_BUILD_ROOT/%{_libdir}/cracklib_dict.pwi
+fi
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/cracklibmodule.*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 
@@ -145,6 +147,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 %{_sbindir}/packer
 
 %changelog
+* Tue Apr 25 2006 Nalin Dahyabhai <nalin@redhat.com> - 2.8.9-2
+- update to 2.8.9
+- only create compat symlinks for the dictionaries if we aren't installing
+  them into the old locations
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.8.6-1.2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index ce75c01..782d4ef 100644
--- a/sources
+++ b/sources
@@ -26,4 +26,4 @@ a2bd31ce25a3057b61d2e5a1182d93a9  sf.gz
 15ec61296de799eaa8111cfabbcbb44f  shakespeare.gz
 c03b38448aefcde059e6fcfb20784f2c  surnames.finnish.gz
 575a44add4db95b43c7abb46b307950f  cracklib-words.gz
-3cef136fe33fc40c57f7514d9aa90c51  cracklib-2.8.6.tar.gz
+9a8c9eb26b48787c84024ac779f64bb2  cracklib-2.8.9.tar.gz