diff --git a/.cvsignore b/.cvsignore
index c3e891e..b457d4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
 expat-1.95.8.tar.gz
+i386
+*.rpm
+clog
diff --git a/expat.spec b/expat.spec
index 70f135c..cabe254 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,7 +1,7 @@
 Summary: A library for parsing XML.
 Name: expat
 Version: 1.95.8
-Release: 6.1
+Release: 7
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
 URL: http://www.libexpat.org/
@@ -29,14 +29,25 @@ to develop XML applications with expat.
 %setup -q
 
 %build
-export CFLAGS="%{optflags} -fPIC"
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure
 make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-%makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1
+%makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \
+        libdir=$RPM_BUILD_ROOT/%{_lib}
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+
+lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*`
+
+ln -s ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so
+
+rm -f $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/*.so
+
+mv $RPM_BUILD_ROOT/%{_lib}/*.a $RPM_BUILD_ROOT%{_libdir}/
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -48,18 +59,21 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc README COPYING
 %{_bindir}/*
-%{_libdir}/lib*.so.*
+/%{_lib}/lib*.so.*
 %{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root)
 %doc Changes doc examples
-%{_libdir}/lib*.a
-%{_libdir}/lib*.la
 %{_libdir}/lib*.so
+%{_libdir}/lib*.a
 %{_includedir}/*.h
 
 %changelog
+* Mon Jan 30 2006 Joe Orton <jorton@redhat.com> 1.95.8-7
+- move library to /lib (#178743)
+- omit .la file (#170031)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt