diff --git a/ChangeLog b/ChangeLog
index c406f0af..e5424bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4334,9 +4334,13 @@ v0.33.19        26-Oct-2001
 		Filerequest responses are now created with long filenames.
 		When sending files, if the remote has the FNC link flag, the
 		filename is mangled to DOS 8.3 format when transmitted.
-		File request response messages now displayy the long and
+		File request response messages now display the long and
 		short filename in the reply.
-		Filerequest resonse messages now have a random quote added.
+		Filerequest response messages now have a random quote added.
+		The binkp driver now sends 8.3 mangled filenames if that 
+		option is set for the remote node in the setup.
+		The hydra driver now sends 8.3 mangled filenames and long
+		filenames as specified in the specs.
 
 	mbtask:
 		Changed to handle the External Doors flag in the lastcaller
diff --git a/mbcico/binkp.c b/mbcico/binkp.c
index 45e0dddf..bb91993b 100644
--- a/mbcico/binkp.c
+++ b/mbcico/binkp.c
@@ -125,6 +125,12 @@ int binkp(int role)
 	}
 
 	eff_remote = remote;
+	/*
+	 * If remote doesn't have the 8.3 flag set, allow long filenames.
+	 */
+	if (!nodes.FNC)
+		remote_flags &= ~SESSION_FNC;
+	
 	tosend = create_filelist(eff_remote, nonhold_mail, 0);
 	request = create_freqlist(remote);
 
diff --git a/mbcico/hydra.c b/mbcico/hydra.c
index 1f645358..02a20bae 100644
--- a/mbcico/hydra.c
+++ b/mbcico/hydra.c
@@ -1,8 +1,7 @@
 /*****************************************************************************
  *
- * File ..................: mbcico/hydra.c
- * Purpose ...............: Fidonet mailer
- * Last modification date : 07-Aug-2001
+ * $Id$
+ * Purpose ...............: Fidonet mailer - Hydra protocol driver
  * Remark ................: See below for more copyright details and credits.
  *
  *****************************************************************************
@@ -871,7 +870,8 @@ int hydra_batch(int role, file_list *to_send)
 					/*
 					 * convert file name to DOS-format
 					 */
-					outbuf = xtodos(to_send->remote);
+					outbuf = xstrcpy(to_send->remote);
+					name_mangle(outbuf);
 					strcpy(txbuf + txlen, outbuf);
 					free(outbuf);
 					for(; txbuf[txlen]; txlen++) {