diff --git a/Docs/sgmlmanual/HTML.dsl b/Docs/sgmlmanual/HTML.dsl

index 49edb5f..62b07c2 100644

--- a/Docs/sgmlmanual/HTML.dsl

+++ b/Docs/sgmlmanual/HTML.dsl

@@ -1,5 +1,5 @@

 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [

-<!ENTITY dbstyle SYSTEM "docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>

+<!ENTITY dbstyle SYSTEM "docbook/dsssl-stylesheets/html/docbook.dsl" CDATA DSSSL>

 ]>

 <style-sheet>

diff --git a/Docs/sgmlmanual/Makefile b/Docs/sgmlmanual/Makefile

index 45b032f..46e0b3e 100644

--- a/Docs/sgmlmanual/Makefile

+++ b/Docs/sgmlmanual/Makefile

@@ -88,14 +88,14 @@ ALL_WVSGML=$(shell /bin/ls *.wvsgml 2>/dev/null)

 	$(MAKE) dirimages htmlimages

 	rm -f $@

 	jade -t rtf -o $*.rtf.tmp \

-		-d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $<

+		-d /usr/lib/sgml/docbook/dsssl-stylesheets/print/docbook.dsl $<

 	cat $*.rtf.tmp | sed 's,"img/\(.*\)\.[^.]*","img.tmp/\1.gif",g' >$@

 	rm -f $*.rtf.tmp

 %.tex: %.sgml

 	rm -f $@

 	jade -t tex -o $*.tex.tmp \

-		-d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $<

+		-d /usr/lib/sgml/docbook/dsssl-stylesheets/print/docbook.dsl $<

 	cat $*.tex.tmp | sed 's,{img/\(.*\)\.[^.]*},{img.tmp/\1.eps},g' >$@

 	rm -f $*.tex.tmp

diff --git a/configure.ac b/configure.ac

index f94f5b7..5096213 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1,6 +1,9 @@

 # Process this file with autoconf to produce a configure script.

 AC_INIT(WvStreams, 4.6.1, wvstreams-devel@googlegroups.com, wvstreams)

 SO_VERSION=4.6

+PATH="$PATH:$libexecdir/qt3/bin"

+CPPFLAGS="-I$includedir/speex -I$includedir/security -I$includedir/openssl"

+LIBS="-lpam"

 # append to a variable without introducing superfluous white space

 AC_DEFUN([WV_APPEND],[

@@ -477,14 +480,14 @@ fi

 # tcl

 if test "$with_tcl" != "no"; then

     CPPFLAGS_save="$CPPFLAGS"

-    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)

+    WV_APPEND(CPPFLAGS, -I/usr/include/tcl)

     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])

     LIBS_save="$LIBS"

-    AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])

+    AC_CHECK_LIB(tcl, TclInterpInit,, [with_tcl=no])

     LIBS="$LIBS_save"

     if test "$with_tcl" != "no"; then

         CPPFLAGS="$CPPFLAGS_save"

-        LIBS_TCL=-ltcl8.3

+        LIBS_TCL=-ltcl

     fi

 fi

diff --git a/streams/wvlockdev.cc b/streams/wvlockdev.cc

index f9b86dd..67a2675 100644

--- a/streams/wvlockdev.cc

+++ b/streams/wvlockdev.cc

@@ -24,7 +24,7 @@ WvLockDev::WvLockDev(WvString _devicename)

 	p = devicename;

     lock_count = 0;

-    filename = WvString("/var/lock/LCK..%s", p);

+    filename = WvString("/var/lock/serial/LCK..%s", p);

 }

diff --git a/streams/wvmodem.cc b/streams/wvmodem.cc

index c0893c3..4121ef1 100644

--- a/streams/wvmodem.cc

+++ b/streams/wvmodem.cc

@@ -193,7 +193,7 @@ void WvModem::setup_modem(bool rtscts)

     drain();

-#if HAVE_LINUX_SERIAL_H

+#if 0

     struct serial_struct old_sinfo, sinfo;

     sinfo.reserved_char[0] = 0;

     if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)