diff --git a/ChangeLog b/ChangeLog
index e9570e09..00c1c7cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,23 @@
 $Id$
 
-v0.39.6		11-Jan-2004
+v0.39.7		14-Jan-2004
+
+
+v0.39.6		11-Jan-2004 - 14-Jan-2004
+
+        upgrade:
+                Check setting 7.x.3.18 for each node. If you know the node uses
+                Irex between 2.24 and 2.29 then set this to Yes or you won't 
+		have good sessions without files with this mailer. Sessions
+		with Irex that do transfer some file are Ok.
 
 	mbcico:
-		New binkp/1.1 driver. Remember to check your Irex links, see
-		the warning with version 0.39.5. In case of troubles please
-		report these. In the mbcico directory are 2 files, binkpold.c
-		and binkpold.h if they are renamed to binkp.c and binkp.h you
-		get the old 1.0 driver back. After some weeks I hope to remove
-		these 2 old files.
+		New binkp/1.1 driver. Check the upgrade for your Irex links.
+		In case of troubles please report these. 
+		In the mbcico directory are 2 files, binkpold.c and binkpold.h
+		if they are renamed to binkp.c and binkp.h you get the old 1.0
+		driver back. After some weeks I hope to remove these 2 old 
+		files.
 		Added support for T-Mail fileboxes, partly written and info
 		provided by Przemyslaw Kwiatkowski (2:480/127).
 
@@ -31,17 +40,6 @@ v0.39.5		24-Dec-2003 - 11-Jan-2004
 		Added setup option per node to disable the binkp/1.1 protocol.
 		Added new binkp/1.1 driver, the code is disabled by default
 		and can only be used with the right configure option.
-		If you want to try the new binkp code, then run ./configure
-		with the --enable-newbinkp option. And if you are brave and
-		do this, please give some feedback about failed sessions with
-		certain mailers. Watch out: debug.log grows very very fast!
-
-	upgrade:
-		Check setting 7.x.3.18 for each node. If you know the node uses
-		Irex 2.29 or older then set this to Yes or you won't have good
-		sessions with these mailers. (For the default compile it doesn't
-		do anything yet, but it will as soon as the new binkp/1.1
-		driver is ready).
 
 	common.a:
 		Allows node locking with zero bytes lockfiles created by some
@@ -52,7 +50,7 @@ v0.39.5		24-Dec-2003 - 11-Jan-2004
 		Binkp code cleanup.
 		Allow m_file command in binkp during file transfer in progress.
 		Fixed a segfault when a session failed.
-		New binkp/1.1 driver, not compiled by default yet.
+		New binkp/1.1 driver, not compiled by default.
 
 	mbout:
 		Poll, remove poll and request failed to points which had no
diff --git a/TODO b/TODO
index be99e9a7..be698b79 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 $Id$
 
-			MBSE BBS V0.39.1 TODO list.
+			MBSE BBS V0.39.7 TODO list.
 			---------------------------
 
 	These are a list of things that must be implemented one way or
@@ -118,16 +118,8 @@ mbfido:
 	   in the toberep database and will be multiple times announced.
 
 mbcico:
-	N: Upgrade binkp protocol to 1.1.
-
-	N: With binkp, if the other node is a binkp/1.0 mailer without MB
-	   mode and we did send a FREQ, a poll must be created after the
-	   session to pickup the result of the FREQ.
-
-	L: Support binkp Argus freqs (Radius too?). Remark: Argus is obsolete
-	   and Radius will support normal freqs in the near future.
-
-	U: Fix binkp file resume when mbcico silently dies.
+	U: Fix binkp file resume when mbcico silently dies. Check with the new
+	   driver.
 
 	U: Check node locking results for EMSI, YooHoo and FTS-0001 sessions.
 
diff --git a/configure b/configure
index 8c449cf2..22089cb0 100755
--- a/configure
+++ b/configure
@@ -1275,7 +1275,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup unix lang examples html
 PACKAGE="mbsebbs"
 MAJOR="0"
 MINOR="39"
-REVISION="6"
+REVISION="7"
 VERSION="$MAJOR.$MINOR.$REVISION"
 COPYRIGHT="Copyright (C) 1997-2004 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2004 M. Broek"
diff --git a/configure.in b/configure.in
index 644e1e53..3dbf2877 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl
 PACKAGE="mbsebbs"
 MAJOR="0"
 MINOR="39"
-REVISION="6"
+REVISION="7"
 VERSION="$MAJOR.$MINOR.$REVISION"
 COPYRIGHT="Copyright (C) 1997-2004 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2004 M. Broek"
diff --git a/mbtask/outstat.c b/mbtask/outstat.c
index dd5b3150..b0b1e62c 100644
--- a/mbtask/outstat.c
+++ b/mbtask/outstat.c
@@ -179,36 +179,6 @@ char *callmode(int mode)
 
 
 
-/*
- * Returns name of T-Mail filebox in Dos format (8+3).
- * I know, this code looks ungly, but it works. - MiCHA :-)
- */
-const char* shortboxname(const faddr *fa) {
-    static char	dirname[12];
-    unsigned	z=fa->zone, n=fa->net, f=fa->node, p=fa->point;
-    unsigned	u,v;
-
-    u=z%32; z/=32; if (z>=32) return NULL;
-    dirname[0]=z<10?z+'0':z-10+'a';
-    dirname[1]=u<10?u+'0':u-10+'a';
-    u=n%32; n/=32; v=n%32; n/=32; if (n>=32) return NULL;
-    dirname[2]=n<10?n+'0':n-10+'a';
-    dirname[3]=v<10?v+'0':v-10+'a';
-    dirname[4]=u<10?u+'0':u-10+'a';
-    u=f%32; f/=32; v=f%32; f/=32; if (f>=32) return NULL;
-    dirname[5]=f<10?f+'0':f-10+'a';
-    dirname[6]=v<10?v+'0':v-10+'a';
-    dirname[7]=u<10?u+'0':u-10+'a';
-    dirname[8]='.';
-    u=p%32; p/=32; if (p>=32) return NULL;
-    dirname[9]=p<10?p+'0':p-10+'a';
-    dirname[10]=u<10?u+'0':u-10+'a';
-    dirname[11]=0;
-    return dirname;
-}
-
-
-
 /*
  * Scan one directory filebox
  */