diff --git a/README b/README
index 73efd2b..7787172 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 TightVNC Source Distribution for Unix platforms
 ===============================================
 
-Copyright (C) 2002-2004 RealVNC Ltd.  All Rights Reserved.
+Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
 Copyright (C) 2000-2004 Constantin Kaplinsky.
 Copyright (C) 2004-2005 Peter Astrand, Cendio AB
 
diff --git a/configure.in b/configure.in
index 73e0223..9b58f27 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rdr/InStream.h)
+AC_INIT(vncviewer_unix/vncviewer.cxx)
 
 PACKAGE=tightvnc
 VERSION=1.5.0
diff --git a/vncinstall b/vncinstall
index e5ab017..ad5dd83 100755
--- a/vncinstall
+++ b/vncinstall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright (C) 2002-2003 RealVNC Ltd.
+#  Copyright (C) 2002-2005 RealVNC Ltd.
 #
 #  This is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@
 
 for f in xc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \
 	 vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
-
   if [ ! -f $f ]; then
     echo "Couldn't find $f"
   else
diff --git a/vncserver b/vncserver
index 19333cb..16fe54a 100755
--- a/vncserver
+++ b/vncserver
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
-#  Copyright (C) 2002-2003 RealVNC Ltd.
+#  Copyright (C) 2002-2005 RealVNC Ltd.
 #  Copyright (C) 1999 AT&T Laboratories Cambridge.  All Rights Reserved.
 #
 #  This is free software; you can redistribute it and/or modify
diff --git a/vncserver.man b/vncserver.man
index 12f0656..9eb88ec 100644
--- a/vncserver.man
+++ b/vncserver.man
@@ -1,4 +1,4 @@
-.TH vncserver 1 "18 May 2004" "TightVNC" "Virtual Network Computing"
+.TH vncserver 1 "17 Apr 2006" "TightVNC" "Virtual Network Computing"
 .SH NAME
 vncserver \- start or stop a VNC server
 .SH SYNOPSIS
diff --git a/xc.patch b/xc.patch
index fc0f41f..a5927b9 100644
--- a/xc.patch
+++ b/xc.patch
@@ -34,7 +34,7 @@
 + XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
 + XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
 + ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
-+ 	$(XVNCLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER),$(XVNCSYSLIBS))
++ 	$(LIBCWRAPPER) $(XVNCLIBS) $(LOADABLEEXTS),$(XVNCSYSLIBS))
   
   
   #if defined(Xsun24Server) && Xsun24Server