diff --git a/CHANGES b/CHANGES
index 318153f..0c239e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 				CHANGES
 				=======
 
+version 8.1.18 (Nov 11, 2010):
+	- install man pages read-only and improved the contributed redhat init
+	  script - patches by Eric Biederman <ebiederm@aristanetworks.com>
+	- spec file improvements in contrib/redhat-rpm - patch by Jodok Ole
+	  Muellers <jodok.muellers@aschendorff.de>
+	- GSS-API patch for client code - patch by Andras Horvath
+	  <Andras.Horvath@cern.ch> 
+
 version 8.1.17 (Sep 29, 2009):
 	- fix for interface detection when HAVE_SA_LEN is defined - first
 	  detected on NetBSD 5.0 and patched by Chris Ross
@@ -894,5 +902,5 @@ before version 6.05:
 	  and enhancements of various types were applied.
 
 #
-#  $Id: CHANGES,v 1.222 2009/09/29 06:24:53 bryan Exp $
+#  $Id: CHANGES,v 1.225 2010/11/11 22:43:17 bryan Exp $
 #
diff --git a/conserver.cf/Makefile.in b/conserver.cf/Makefile.in
index 1f669ac..9a53447 100644
--- a/conserver.cf/Makefile.in
+++ b/conserver.cf/Makefile.in
@@ -24,8 +24,8 @@ distclean: clean
 
 install:
 	$(MKDIR) $(DESTDIR)$(mandir)/man5
-	$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
-	$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
+	$(INSTALL) -m 0644 conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
+	$(INSTALL) -m 0644 conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
 	$(MKDIR) $(DESTDIR)$(exampledir)
 	$(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
 	$(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
diff --git a/conserver.cf/conserver.cf.man b/conserver.cf/conserver.cf.man
index 47dcf37..ff609cb 100644
--- a/conserver.cf/conserver.cf.man
+++ b/conserver.cf/conserver.cf.man
@@ -1,5 +1,5 @@
 .\" $Id: conserver.cf.man,v 1.78 2007/04/02 17:59:16 bryan Exp $
-.TH CONSERVER.CF 5 "2007/04/02" "conserver-8.1.17" "conserver"
+.TH CONSERVER.CF 5 "2007/04/02" "conserver-8.1.18" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
 .BR conserver (8)
diff --git a/conserver.cf/conserver.passwd.man b/conserver.cf/conserver.passwd.man
index a8942f3..47683d9 100644
--- a/conserver.cf/conserver.passwd.man
+++ b/conserver.cf/conserver.passwd.man
@@ -1,5 +1,5 @@
 .\" $Id: conserver.passwd.man,v 1.10 2004/01/08 16:12:33 bryan Exp $
-.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.17" "conserver"
+.TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.1.18" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
 .BR conserver (8)
diff --git a/conserver.html b/conserver.html
index 7f9d898..2482240 100644
--- a/conserver.html
+++ b/conserver.html
@@ -182,11 +182,8 @@ body {
 
         <H3>Downloading</H3>
 
-        <P>The current version, released on Sep 29, 2009, is
-        <A href="8.1.17.tar.gz">8.1.17.tar.gz</A>. You can get it
-        via <A href=
-        "ftp://ftp.conserver.com/conserver/8.1.17.tar.gz">FTP</A>
-        or <A href="8.1.17.tar.gz">HTTP</A>. See the <A href=
+        <P>The current version, released on Nov 11, 2010, is
+        <A href="8.1.18.tar.gz">8.1.18.tar.gz</A>. See the <A href=
         "CHANGES">CHANGES</A> file for information on the latest
         updates.</P>
 
diff --git a/conserver/Makefile.in b/conserver/Makefile.in
index 9051c88..608da98 100644
--- a/conserver/Makefile.in
+++ b/conserver/Makefile.in
@@ -62,7 +62,7 @@ install: conserver
 	$(MKDIR) $(DESTDIR)$(sbindir)
 	$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
 	$(MKDIR) $(DESTDIR)$(mandir)/man8
-	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
+	$(INSTALL) -m 0644 conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
 	$(MKDIR) $(DESTDIR)$(exampledir)
 	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
 	$(MKDIR) $(DESTDIR)$(pkglibdir)
diff --git a/conserver/conserver.man b/conserver/conserver.man
index d5ee8c5..28f69f7 100644
--- a/conserver/conserver.man
+++ b/conserver/conserver.man
@@ -1,6 +1,6 @@
 .\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine
 .\" $Id: conserver.man,v 1.54 2006/12/31 02:02:48 bryan Exp $
-.TH CONSERVER 8 "2006/12/31" "conserver-8.1.17" "conserver"
+.TH CONSERVER 8 "2006/12/31" "conserver-8.1.18" "conserver"
 .SH NAME
 conserver \- console server daemon
 .SH SYNOPSIS
diff --git a/conserver/cutil.c b/conserver/cutil.c
index a94ca8b..7a51aee 100644
--- a/conserver/cutil.c
+++ b/conserver/cutil.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: cutil.c,v 1.133 2009/09/26 09:20:29 bryan Exp $
+ *  $Id: cutil.c,v 1.134 2010/11/02 03:42:57 bryan Exp $
  *
  *  Copyright conserver.com, 2000
  *
@@ -2283,7 +2283,7 @@ ProbeInterfaces(bindAddr)
 	if ((ifc.ifc_len - r) < sizeof(*ifr))
 	    break;
 #ifdef HAVE_SA_LEN
-	if (sa->sa_len > sizeof(ifr->ifr_irfu))
+	if (sa->sa_len > sizeof(ifr->ifr_ifru))
 	    r += sizeof(ifr->ifr_name) + sa->sa_len;
 	else
 #endif
diff --git a/conserver/version.h b/conserver/version.h
index 2b1f112..a6b79f9 100644
--- a/conserver/version.h
+++ b/conserver/version.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: version.h,v 1.76 2009/09/29 06:24:53 bryan Exp $
+ *  $Id: version.h,v 1.77 2010/11/11 22:44:10 bryan Exp $
  *
  *  Copyright conserver.com, 2000
  *
@@ -16,6 +16,6 @@ All rights reserved.\n"
 
 #define VERSION_MAJOR	8
 #define VERSION_MINOR	1
-#define VERSION_REV	17
+#define VERSION_REV	18
 #define VERSION_TEXT	"conserver.com version"
 #define VERSION_UINT	(VERSION_MAJOR * 1000000 + VERSION_MINOR * 1000 + VERSION_REV)
diff --git a/console/Makefile.in b/console/Makefile.in
index 5c134ef..cc7aaef 100644
--- a/console/Makefile.in
+++ b/console/Makefile.in
@@ -56,6 +56,6 @@ install: console
 	$(MKDIR) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) console $(DESTDIR)$(bindir)
 	$(MKDIR) $(DESTDIR)$(mandir)/man1
-	$(INSTALL) console.man $(DESTDIR)$(mandir)/man1/console.1
+	$(INSTALL) -m 0644 console.man $(DESTDIR)$(mandir)/man1/console.1
 
 .PHONY: clean distclean install
diff --git a/console/console.c b/console/console.c
index 9396a62..ed38d00 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: console.c,v 5.184 2009/09/27 22:32:03 bryan Exp $
+ *  $Id: console.c,v 5.185 2009/10/19 06:44:06 bryan Exp $
  *
  *  Copyright conserver.com, 2000
  *
@@ -228,7 +228,7 @@ AttemptGSSAPI(pcf)
 			     GSS_C_MUTUAL_FLAG, 0,
 			     GSS_C_NO_CHANNEL_BINDINGS, &servertok, NULL,
 			     &mytok, NULL, NULL);
-    gss_release_buffer(NULL, &mytok);
+    gss_release_buffer(&stmin, &mytok);
 
     ret = (stmaj == GSS_S_COMPLETE);
     gss_release_name(&stmin, &gss_server_name);
diff --git a/console/console.man b/console/console.man
index e77dc93..e01c509 100644
--- a/console/console.man
+++ b/console/console.man
@@ -1,5 +1,5 @@
 .\" $Id: console.man,v 1.61 2006/04/03 13:32:12 bryan Exp $
-.TH CONSOLE 1 "2006/04/03" "conserver-8.1.17" "conserver"
+.TH CONSOLE 1 "2006/04/03" "conserver-8.1.18" "conserver"
 .SH NAME
 console \- console server client program
 .SH SYNOPSIS
diff --git a/contrib/redhat-rpm/conserver.init b/contrib/redhat-rpm/conserver.init
index e4d5bca..347e681 100755
--- a/contrib/redhat-rpm/conserver.init
+++ b/contrib/redhat-rpm/conserver.init
@@ -25,31 +25,48 @@ DAEMON=/usr/sbin/conserver
 [ -x $DAEMON  ] || exit 1
 
 
+start()
+{
+	echo -n "Starting conserver: "
+	daemon --user "${RUNAS-}" $DAEMON ${OPTIONS--d}
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && touch /var/lock/subsys/conserver
+	echo
+}
+
+stop()
+{
+	echo -n "Shutting down conserver: "
+	killproc conserver
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/conserver
+	echo
+}
+  
 # See how we were called.
 case "$1" in
   start)
-    echo -n "Starting conserver: "
-    daemon --user "${RUNAS-}" $DAEMON ${OPTIONS--d}
-    echo
-    touch /var/lock/subsys/conserver
+    start
     ;;
   stop)
-    echo -n "Shutting down conserver: "
-    killproc conserver
-    echo
-    rm -f /var/lock/subsys/conserver
+    stop
     ;;
   status)
     status conserver
     ;;
   restart)
-    echo -n "Restarting conserver: "
+    stop
+    start
+    ;;
+  reload)
+    echo -n "Reloading conserver: "
     killproc conserver -HUP
+    RETVAL=$?
     echo
     ;;
   *)
-    echo "Usage: conserver {start|stop|restart|status}"
-    exit 1
+    echo "Usage: conserver {start|stop|restart|reload|status}"
+    RETVAL=1
 esac
 
-exit 0
+exit $RETVAL
diff --git a/contrib/redhat-rpm/conserver.spec b/contrib/redhat-rpm/conserver.spec
index 1e7d1fc..6ba8471 100644
--- a/contrib/redhat-rpm/conserver.spec
+++ b/contrib/redhat-rpm/conserver.spec
@@ -4,7 +4,7 @@
 #
 
 %define pkg  conserver
-%define ver  8.1.17
+%define ver  8.1.18
 
 # define the name of the machine on which the main conserver
 # daemon will be running if you don't want to use the default
@@ -24,11 +24,11 @@
 # additionally you can use macros logfile pidfile
 # example: rpmbuild -bb conserver.spec --define "pidfile /var/run/conserver/pid"
 
-Summary: Serial console server daemon/client
 Name: %{pkg}
 Version: %{ver}
 Release: %{distver}
 License: BSD
+Summary: Serial console server daemon/client
 Group: System Environment/Daemons
 URL: http://www.conserver.com/
 Source: http://www.conserver.com/%{pkg}-%{ver}.tar.gz
@@ -48,13 +48,29 @@ BuildRequires: dmalloc
 %endif
 Prefix: %{_prefix}
 
+%package server
+Summary: Serial console server daemon
+Group: System Environment/Daemons
+
+%package client
+Summary: Serial console server client
+Group: Applications/Internet
 
 %description
-Conserver is an application that allows multiple users to watch a
+Conserver is a daemon that allows multiple users to watch a
 serial console at the same time.  It can log the data, allows users to
 take write-access of a console (one at a time), and has a variety of
 bells and whistles to accentuate that basic functionality.
 
+%description server
+conserver-server is a daemon that allows multiple users to watch a
+serial console at the same time.  It can log the data, allows users to
+take write-access of a console (one at a time), and has a variety of
+bells and whistles to accentuate that basic functionality.
+
+%description client
+conserver-client to connect to conserver-server using a tcp port.
+Allows multiple users to watch a serial console at the same time.
 
 %prep
 %{__rm} -rf %{buildroot}
@@ -97,7 +113,7 @@ make
 %{__rm} -rf %{buildroot}
 
 
-%post
+%post server
 if [ -x %{_initrddir}/conserver ]; then
   /sbin/chkconfig --add conserver
 fi
@@ -107,7 +123,7 @@ if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
 fi
 
 
-%preun
+%preun server
 if [ "$1" = 0 ]; then
   if [ -x %{_initrddir}/conserver ]; then
     %{_initrddir}/conserver stop
@@ -115,17 +131,17 @@ if [ "$1" = 0 ]; then
   fi
 fi
 
+# we need this even if empty
+#%files
 
-%files
+%files server
 %defattr(-,root,root)
 %doc CHANGES FAQ INSTALL README conserver.cf
 %config(noreplace) %{_sysconfdir}/conserver.cf
 %config(noreplace) %{_sysconfdir}/conserver.passwd
 %config(noreplace) %{_sysconfdir}/default/conserver
 %attr(555,root,root) %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver/convert
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man8/conserver.8.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
@@ -133,11 +149,19 @@ fi
 %{_datadir}/examples/conserver/conserver.passwd
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root)
+%doc CHANGES FAQ INSTALL README
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Oct 14 2009 Jodok Ole Muellers <muellejo@aschendorff.de>
+  - Changed the conserver.spec file to create separate subpackages
+    for client and server by using the %package directive.
 * Wed Sep 25 2009 Fabien Wernli
   - added configure prerequisites
 * Thu Sep 24 2009 Fabien Wernli
   - added prefix to configure
   - changed some hardcoded values to proper macros:
     didn't work on x64 lib -> lib64
-
diff --git a/contrib/solaris-package/pkginfo b/contrib/solaris-package/pkginfo
index 4e4f716..4d66ea4 100644
--- a/contrib/solaris-package/pkginfo
+++ b/contrib/solaris-package/pkginfo
@@ -1,7 +1,7 @@
 PKG="conserver"
 NAME="Console server and client"
 CATEGORY="system"
-VERSION="8.1.17"
+VERSION="8.1.18"
 DESC="Console server and client"
 CLASSES=none
 ARCH=sparc