diff --git a/libwvstreams.spec b/libwvstreams.spec
index d433d01..ea303d3 100644
--- a/libwvstreams.spec
+++ b/libwvstreams.spec
@@ -1,14 +1,15 @@
 Name: libwvstreams
 Version: 3.70
-Release: 5
+Release: 8
 Summary: WvStreams is a network programming library written in C++.
 Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz
 Patch0: libwvstreams-3.69-redhat.patch
 Patch1: libwvstreams-3.70-gcc3.patch
+Patch2: libwvstreams-3.70-openssl097.patch
 URL: http://open.nit.ca/wvstreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/libwvstreams-root
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel, pkgconfig
 License: LGPL
 
 %description
@@ -29,14 +30,19 @@ needed for developing applications which use WvStreams.
 %setup -q -n wvstreams-%{version}
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .gcc3
+%patch2 -p1 -b .openssl097
 
 %build
-make COPTS="$RPM_OPT_FLAGS -fPIC"
+if pkg-config openssl ; then
+	cppopts="CPPOPTS=`pkg-config --cflags-only-I openssl`"
+	ldopts="LDOPTS=`pkg-config --libs-only-L openssl`"
+fi
+make COPTS="$RPM_OPT_FLAGS -fPIC" LIBDIR=%{_libdir} "$cppopts" "$ldopts"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT/usr
-chmod 755 $RPM_BUILD_ROOT/usr/lib/*.so.*
+make install PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=$RPM_BUILD_ROOT/%{_libdir}
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,18 +50,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB src/README
-/usr/lib/*.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-/usr/include/wvstreams
-/usr/lib/*.a
-/usr/lib/*.so
+%{_includedir}/wvstreams
+%{_libdir}/*.a
+%{_libdir}/*.so
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 3.70-7
+- rebuild
+
+* Fri Jan  3 2003 Nalin Dahyabhai <nalin@redhat.com>
+- correct an const/not-const type mismatch that breaks compilation with newer
+  OpenSSL
+- add flags from pkgconfig so that OpenSSL is always found
+
+* Tue Sep 10 2002 Mike A. Harris <mharris@redhat.com> 3.70-6
+- use FHS macros for multilib systems
+
 * Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com>
 - rebuilt with gcc-3.2 (we hope)