diff --git a/Xaw3d.spec b/Xaw3d.spec
index 98c8ccd..8cfdd60 100644
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5
-Release: 7
+Release: 9
 Group: System Environment/Libraries
 Source: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -15,7 +15,7 @@ Patch4: Xaw3d-1.3-static.patch
 Patch5: Xaw3d-ia64.patch
 Copyright: MIT
 Prefix: /usr
-Prereq: fileutils
+Prereq: fileutils /sbin/ldconfig
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -30,7 +30,7 @@ those applications.
 %package devel
 Summary: Header files and static libraries for development using Xaw3d.
 Group: Development/Libraries
-Requires: Xaw3d
+Requires: %{name} = %{version}
 
 %description devel
 Xaw3d is an enhanced version of the MIT Athena widget set for
@@ -111,13 +111,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %post devel
 if [ ! -d /usr/X11R6/include/Xaw3d ] ; then
-	rm -f /usr/X11R6/include/Xaw3d
-	ln -sf X11/Xaw3d /usr/X11R6/include
+  rm -f /usr/X11R6/include/Xaw3d
+  ln -sf X11/Xaw3d /usr/X11R6/include
+fi
+
+%pre devel
+if [ -L /usr/X11R6/include/X11/Xaw3d ] ; then
+  rm -f /usr/X11R6/include/X11/Xaw3d
 fi
 
 %triggerpostun -- Xaw3d-devel < 1.5-5
-[ -d /usr/X11R6/include/Xaw3d ] && rm -rf /usr/X11R6/include/Xaw3d
-ln -sf X11/Xaw3d /usr/X11R6/include
+if [ -d /usr/X11R6/include/Xaw3d ] ; then
+  rm -rf /usr/X11R6/include/Xaw3d
+  ln -sf X11/Xaw3d /usr/X11R6/include
+fi
 
 %files
 %defattr(-,root,root)
@@ -131,6 +138,13 @@ ln -sf X11/Xaw3d /usr/X11R6/include
 %ghost /usr/X11R6/include/Xaw3d
 
 %changelog
+* Wed Feb 28 2001 Than Ngo <than@redhat.com>
+- add requires Xaw3d = %%{version}
+- add prereq /sbin/ldconfig
+
+* Tue Oct 10 2000 Than Ngo <than@redhat.com>
+- fix link which causes faulty update (Bug #17895)
+
 * Mon Jul 24 2000 Bill Nottingham <notting@redhat.com>
 - ia64 tweaks