diff --git a/ChangeLog b/ChangeLog
index 42a4542..09f4343 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Version NEXT
+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
 	 debuging code in client library
+	fsp/fifocache.c changed malloc.h to stdlib.h -> allow compile on
+	 freebsd
+	do not use ${RM} in clients/Makefile.am -> allow compile with bsd make
 
 Version 2.8.1b18 - 25 Nov 24 2003
         This is MINIMUM REQUIRED VERSION for applications which are using
diff --git a/TODO b/TODO
index bf1e851..c822452 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 FSP SUITE TO DO LIST BY RADIM KOLAR 
-/* maintained by hsn -at- cybermail * net */
+/* maintained by hsn -at- netmag * cz */
 
 LARGEFILES64 how to turn them on:
 Cygwin: #define __LARGE64_FILES fopen64,ftello64,fseeko64 _off64_t
@@ -94,3 +94,4 @@ FSP backend for APT
 FSP plugin do Netscape/MSIE
 Transfer HTTP over fsp transport
 FSP support to lftp,wget,curl
+AVFS plugin http://sourceforge.net/projects/avf
diff --git a/clients/Makefile.am b/clients/Makefile.am
index 6825444..acc73f4 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -25,62 +25,62 @@ AM_CFLAGS:=-DSYSCONFDIR="\"@sysconfdir@\"" $(AM_CFLAGS)
 fcatcmd_m.o:
 	@echo '#include "fcatcmd.c"' > fcatcmd_m.c
 	$(COMPILE) -Dmain=fcatcmd_main -c fcatcmd_m.c
-	@${RM} -f fcatcmd_m.c
+	@rm -f fcatcmd_m.c
 fcdcmd_m.o: 
 	@echo '#include "fcdcmd.c"' > fcdcmd_m.c
 	${COMPILE} -Dmain=fcdcmd_main -c fcdcmd_m.c
-	@${RM} -f fcdcmd_m.c
+	@rm -f fcdcmd_m.c
 fducmd_m.o:
 	@echo '#include "fducmd.c"' > fducmd_m.c
 	${COMPILE} -Dmain=fducmd_main -c fducmd_m.c
-	@${RM} -f fducmd_m.c
+	@rm -f fducmd_m.c
 ffindcmd_m.o:
 	@echo '#include "ffindcmd.c"' > ffindcmd_m.c
 	${COMPILE} -Dmain=ffindcmd_main -c ffindcmd_m.c
-	@${RM} -f ffindcmd_m.c
+	@rm -f ffindcmd_m.c
 fgetcmd_m.o:
 	@echo '#define COMMAND_GET' > fgetcmd_m.c
 	@echo '#include "fgetcmd.c"' >> fgetcmd_m.c
 	${COMPILE} -Dmain=fgetcmd_main -c fgetcmd_m.c
-	@${RM} -f fgetcmd_m.c
+	@rm -f fgetcmd_m.c
 fgrabcmd_m.o:
 	@echo '#include "fgrabcmd.c"' > fgrabcmd_m.c
 	${COMPILE} -Dmain=fgrabcmd_main -c fgrabcmd_m.c
-	@${RM} -f fgrabcmd_m.c
+	@rm -f fgrabcmd_m.c
 fhostcmd_m.o:
 	@echo '#include "fhostcmd.c"' > fhostcmd_m.c
 	${COMPILE} -Dmain=fhostcmd_main -c fhostcmd_m.c
-	@${RM} -f fhostcmd_m.c
+	@rm -f fhostcmd_m.c
 flscmd_m.o:
 	@echo '#include "flscmd.c"' > flscmd_m.c
 	${COMPILE} -Dmain=flscmd_main -c flscmd_m.c
-	@${RM} -f flscmd_m.c
+	@rm -f flscmd_m.c
 fmkdir_m.o:
 	@echo '#include "fmkdir.c"' > fmkdir_m.c
 	${COMPILE} -Dmain=fmkdir_main -c fmkdir_m.c
-	@${RM} -f fmkdir_m.c
+	@rm -f fmkdir_m.c
 fprocmd_m.o:
 	@echo '#include "fprocmd.c"' > fprocmd_m.c
 	$(COMPILE) -Dmain=fprocmd_main -c fprocmd_m.c
-	@${RM} -f fprocmd_m.c
+	@rm -f fprocmd_m.c
 fput_m.o:
 	@echo '#include "fput.c"' > fput_m.c
 	${COMPILE} -Dmain=fput_main -c fput_m.c
-	@${RM} -f fput_m.c
+	@rm -f fput_m.c
 frmcmd_m.o:
 	@echo '#include "frmcmd.c"' > frmcmd_m.c
 	${COMPILE} -Dmain=frmcmd_main -c frmcmd_m.c
-	@${RM} -f frmcmd_m.c
+	@rm -f frmcmd_m.c
 frmdircmd_m.o:
 	@echo '#include "frmdircmd.c"' > frmdircmd_m.c
 	${COMPILE} -Dmain=frmdircmd_main -c frmdircmd_m.c
-	@${RM} -f frmdircmd_m.c
+	@rm -f frmdircmd_m.c
 fver_m.o:
 	@echo '#include "fver.c"' > fver_m.c
 	${COMPILE} -Dmain=fver_main -c fver_m.c
-	@${RM} -f fver_m.c
+	@rm -f fver_m.c
 fstatcmd_m.o:
 	@echo '#include "fstatcmd.c"' > fstatcmd_m.c
 	${COMPILE} -Dmain=fstatcmd_main -c fstatcmd_m.c
-	@${RM} -f fstatcmd_m.c
+	@rm -f fstatcmd_m.c
 
diff --git a/configure.ac b/configure.ac
index 8abbb70..476e263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a working configure script.
 dnl tested with autoconf 2.57
-AC_INIT(fsp,2.8.1b18,hsn@cybermail.net)
+AC_INIT(fsp,2.8.1b19,hsn@netmag.cz)
 AC_CONFIG_SRCDIR(server/main.c)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
diff --git a/server/fifocache.c b/server/fifocache.c
index 9c9e151..8ef330c 100644
--- a/server/fifocache.c
+++ b/server/fifocache.c
@@ -7,7 +7,7 @@
  */
 
 #include "tweak.h"
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include "fifocache.h"