diff --git a/.cvsignore b/.cvsignore
index 578008b..5b82915 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,6 +2,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
+config.h.in
 compile
 config.cache
 config.guess
diff --git a/ChangeLog b/ChangeLog
index 1083237..abe13a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+Version NEXT
 	fixed sf bug 1060594: fspd: owner can't rename files
 	fixed sf bug 1060558: fpro 'l' sets 'm' flag instead (dairiki)
 	fixed sf bug 1060558: fpro 'l' flag was not correctly saved
@@ -9,9 +10,12 @@
 	Lamerpack: disable most of command line options in fspd and print
 	  simpler help message.
 	server_install: zero length filename cancels upload in progress
-	  this change is needed for upcoming fsplib.
+	  this change is needed for upcoming gftp/fsplib support.
+	PROTOCOL: CC_INSTALL: document zero length filename, use request
+	  position for sizing of extra data.
+	PROTOCOL: CC_SET_PRO: Use request position for sizing of extra data.  
 
-version 2.8.1b21 - 1 Nov 2004
+Version 2.8.1b21 - 1 Nov 2004
 	check for errors while copying files in fspd.
 	removed all the PROTOX macros junk. Tools for analyzing C source
 	  code works with fsp codebase now as result.
@@ -43,7 +47,7 @@ version 2.8.1b21 - 1 Nov 2004
 	  at all. Previous versions sends one null byte
 	printpro.c - print readme only if nonzero sized
 
-version 2.8.1b20 - 26 Oct 2004
+Version 2.8.1b20 - 26 Oct 2004
 	Added pidfile.[c|h] from FreeBSD and modified it to fit in (hoaxter)
 	Added pidfile support, config option is 'pidlogname' (hoaxter)
 	Replaced .file information from INSTALL with a hint to man 1 fspd (hoaxter)
@@ -100,7 +104,7 @@ version 2.8.1b20 - 26 Oct 2004
 	lamerz guide added
 	text rotate tool added
 
-version 2.8.1b19 - 11 jan 2004
+Version 2.8.1b19 - 11 jan 2004
 	sven has added fspget URL command to setup.sh.
 	fixed case for mklargefile.py in tests/Makefile.am
 	added --enable-debug switch to configure for enabling extra
diff --git a/TODO b/TODO
index 25e4ff4..3944393 100644
--- a/TODO
+++ b/TODO
@@ -18,7 +18,7 @@ symlink to FILE can escape from FSP root directory. OLD known problem.
 symlink support must be reworked before final release.
 
 PROTOCOL-RELATED BUGS:
-none
+add real,portable error codes support to CC_ERR extended data area.
 
 PORTING
 Sven's Slowaris 8 compile problem
@@ -31,7 +31,7 @@ Client LIBRARY
 :high:
 we should retune retry algoritm for better support lines with higher
   packed loss. On common internet lines current one works okay.
-add more detailed stats from retry alg.  
+add more detailed stats from retry alg.
 :low:
 fver and others add support new syntax fsp://host:port/file
 add sem locking method, possible?
@@ -42,10 +42,7 @@ better support for persistent keys - do not send cc_bye ? this should
   be probably configurable
 
 :long-term goals:
-:better to write a new code instead of fixing 10 yo crap.
-=convert to multi threaded=
-make setup from env a separate function
-do not use global variables
+drop this library and use libfsp instead
 
 CLIENTS 
 :high: 
diff --git a/doc/PROTOCOL b/doc/PROTOCOL
index b417143..89f01c2 100644
--- a/doc/PROTOCOL
+++ b/doc/PROTOCOL
@@ -1,8 +1,8 @@
 			FILE SERVICE PROTOCOL VERSION 2
 				     FSP v2
 
-			     Document version 0.14
-			    Last updated  29 Nov 2004
+			     Document version 0.15
+			    Last updated  2 Dec 2004
 
 				 Also known as
 			    File Slurping Protocol,
@@ -109,10 +109,9 @@ MESSAGE_CHECKSUM
 Entire packet (HEADER + DATA + XTRA DATA) is checksummed.  When computing a
 checksum use zero in place of MESSAGE_CHECKSUM header field. 
 
-Due to some unknown reason, method of computing checksums is different
-in each direction. For packets traveling from server to client initial
-checksum value is zero, otherwise it is HEADER + DATA + XTRA DATA
-size.
+Method of computing checksums is different in each direction. For
+packets traveling from server to client initial checksum value is
+zero, otherwise it is size of (HEADER + DATA + XTRA DATA).
 
 Checksums in server->client direction are computed as follows:
 
@@ -316,7 +315,7 @@ RDIRENT.HEADER types:
  CC_INSTALL 0x44		- close and install file opened for writing
 
  		request
-		file position:	not used
+		file position:	length of extra data
 		data:           ASCIIZ filename
 		xtra data:	(not required)
 		                long - timestamp in Unix format
@@ -331,6 +330,11 @@ RDIRENT.HEADER types:
 		terminator) filename. This removes temporary data
 		created by upload.
 
+		Compatibility
+
+		Upload cancel feature and sizing of extra data was
+		first used in fsp 2.8.1b22.
+
  CC_DEL_FILE 0x45		- delete a file
 
  		request
@@ -388,7 +392,7 @@ RDIRENT.HEADER types:
  CC_SET_PRO 0x48		- set directory protection
 
  		request
-		file position:	not used
+		file position:	size of extra data
 		data:           ASCIIZ directory
 		xtra data:	2 bytes of protection change command
 		                1st byte:
@@ -409,6 +413,9 @@ RDIRENT.HEADER types:
 		FSP versions older than 2.8.1 beta15 used p flag instead
 		g flag. +p = -g
 
+		Sizing of extra data in request was added in
+		fsp2.8.1b22.
+
  CC_MAKE_DIR 0x49		- create a directory
 
  		request