diff --git a/ChangeLog b/ChangeLog
index 198aafc4..91bcce0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,7 +30,8 @@ v0.35.06
 		the wrong filetime in the files database. The mbfile check
 		command would detect and correct this.
 		TIC files added to the bbs will now also have a 8.3 hard link.
-
+		With TIC file attaches, the filename attached is the 8.3 name.
+	
 	mbcico:
 		With filetransfer errors, the attempts counter was not 
 		increased.
diff --git a/mbfido/forward.c b/mbfido/forward.c
index 560664d2..d0cf0b2d 100644
--- a/mbfido/forward.c
+++ b/mbfido/forward.c
@@ -102,12 +102,18 @@ void ForwardFile(fidoaddr Node, fa_list *sbl)
     /*
      * Create the full filename
      */
-    if (TIC.SendOrg) {
+    if (TIC.PassThru || TIC.SendOrg) {
 	sprintf(fwdfile, "%s/%s", TIC.Inbound, TIC.RealName);
 	subject = xstrcpy(TIC.RealName);
     } else {
-	sprintf(fwdfile, "%s/%s", TIC.BBSpath, TIC.NewName);
-	subject = xstrcpy(TIC.NewName);
+	/*
+	 * Make sure the file attach is the 8.3 filename
+	 */
+	temp = xstrcpy(TIC.NewName);
+	name_mangle(temp);
+	sprintf(fwdfile, "%s/%s", TIC.BBSpath, temp);
+	subject = xstrcpy(temp);
+	free(temp);
     }
 
     flavor = 'f';