diff --git a/ChangeLog b/ChangeLog
index 7322e7bb..f722855b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,12 +24,18 @@ v0.51.1		21-Feb-2004
 
 	mbsebbs:
 		Writes the ^aCHRS: kludge again in new created messages.
+		Changed ^aPID to include OS and CPU.
 
 	mbmsg:
 		Writes the ^aCHRS: kludge again in new created messages.
+		Changed ^aPID to include OS and CPU.
 
 	mbaff:
 		Writes the ^aCHRS: kludge again in new created messages.
+		Changed ^aPID to include OS and CPU.
+
+	mbfido:
+		Changed ^aTID to include OS and CPU.
 
 
 v0.51.0		09-Feb-2004 - 21-Feb-2004
diff --git a/lib/ftnmsg.c b/lib/ftnmsg.c
index b03b6f59..a9a8eab9 100644
--- a/lib/ftnmsg.c
+++ b/lib/ftnmsg.c
@@ -132,7 +132,7 @@ FILE *ftnmsghdr(ftnmsg *fmsg, FILE *pkt, faddr *routeaddr, char flavor, char *Pi
 			fmsg->reply_n);
 
 	Now = time(NULL) - (gmt_offset((time_t)0) * 60);
-	fprintf(pkt, "\001PID: %s %s\r", Pid, VERSION);
+	fprintf(pkt, "\001PID: %s %s (%s-%s)\r", Pid, VERSION, OsName(), OsCPU());
 	fprintf(pkt, "\001TZUTC: %s\r", gmtoffset(Now));
 	if (ferror(pkt)) 
 		return NULL;
diff --git a/mbfido/bounce.c b/mbfido/bounce.c
index dcd0b4ae..b444bdb1 100644
--- a/mbfido/bounce.c
+++ b/mbfido/bounce.c
@@ -97,7 +97,7 @@ int Bounce(faddr *f, faddr *t, FILE *fp, char *reason)
 	    fprintf(np, "\001REPLY:%s\r", Buf+7);
 	}
     }
-    fprintf(np, "\001PID: MBSE-FIDO %s\r", VERSION);
+    fprintf(np, "\001PID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
     fprintf(np, "\001TZUTC: %s\r", gmtoffset(Now));
 
     fprintf(np, "     Dear %s\r\r", MBSE_SS(f->name));
diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c
index 639bc42c..d630276e 100644
--- a/mbfido/mgrutil.c
+++ b/mbfido/mgrutil.c
@@ -388,7 +388,7 @@ int UplinkRequest(faddr *t, faddr *From, int FileMgr, char *cmd)
      * Add MSGID, REPLY and PID
      */
     fprintf(qp, "\001MSGID: %s %08lx\r", aka2str(Orig), sequencer());
-    fprintf(qp, "\001PID: MBSE-FIDO %s\r", VERSION);
+    fprintf(qp, "\001PID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
     fprintf(qp, "\001TZUTC: %s\r", gmtoffset(Now));
 
     /*
diff --git a/mbfido/msgutil.c b/mbfido/msgutil.c
index e17ad042..5d998f64 100644
--- a/mbfido/msgutil.c
+++ b/mbfido/msgutil.c
@@ -87,7 +87,7 @@ void Msg_Pid(void)
 	time_t	tt;
 
 	temp = calloc(81, sizeof(char));
-	sprintf(temp, "\001PID: MBSE-FIDO %s", VERSION);
+	sprintf(temp, "\001PID: MBSE-FIDO %s (%s-%s)", VERSION, OsName(), OsCPU());
 	MsgText_Add2(temp);
 	if (msgs.Charset != FTNC_NONE) {
 	    sprintf(temp, "\001CHRS: %s", getchrs(msgs.Charset));
diff --git a/mbfido/ping.c b/mbfido/ping.c
index a5eafee5..6633e196 100644
--- a/mbfido/ping.c
+++ b/mbfido/ping.c
@@ -101,7 +101,7 @@ int Ping(faddr *f, faddr *t, FILE *fp, int intransit)
 	    fprintf(np, "\001REPLY:%s\r", Buf+7);
 	}
     }
-    fprintf(np, "\001PID: MBSE-FIDO %s\r", VERSION);
+    fprintf(np, "\001PID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
     fprintf(np, "\001TZUTC: %s\r", gmtoffset(Now));
 
     fprintf(np, "     Dear %s\r\r", MBSE_SS(f->name));
diff --git a/mbfido/post.c b/mbfido/post.c
index b1f5ed56..33ec7d1c 100644
--- a/mbfido/post.c
+++ b/mbfido/post.c
@@ -189,7 +189,7 @@ void Post(char *To, long Area, char *Subj, char *File, char *Flavor)
 	MsgText_Add2(temp);
 	Msg.MsgIdCRC = upd_crc32(temp, crc, strlen(temp));
 	Msg.ReplyCRC = 0xffffffff;
-	sprintf(temp, "\001PID: MBSE-FIDO %s", VERSION);
+	sprintf(temp, "\001PID: MBSE-FIDO %s (%s-%s)", VERSION, OsName(), OsCPU());
 	MsgText_Add2(temp);
 	if (msgs.Charset != FTNC_NONE) {
 	    sprintf(temp, "\001CHRS: %s", getchrs(msgs.Charset));
diff --git a/mbfido/rfc2ftn.c b/mbfido/rfc2ftn.c
index 983f40e3..af4d2a05 100644
--- a/mbfido/rfc2ftn.c
+++ b/mbfido/rfc2ftn.c
@@ -398,7 +398,7 @@ int rfc2ftn(FILE *fp, faddr *recipient)
 		fprintf(ofp, "\1PID:");
 		kludgewrite(p, ofp);
 	    } else {
-		fprintf(ofp, "\001PID: MBSE-FIDO %s\n", VERSION);
+		fprintf(ofp, "\001PID: MBSE-FIDO %s (%s-%s)\n", VERSION, OsName(), OsCPU());
 	    }
 	}
 
@@ -421,7 +421,7 @@ int rfc2ftn(FILE *fp, faddr *recipient)
 	    }
 	}
 	if (!(hdr((char *)"X-FTN-Tearline", msg)) && !(hdr((char *)"X-FTN-TID", msg))) {
-	    sprintf(temp, " MBSE-FIDO %s", VERSION);
+	    sprintf(temp, " MBSE-FIDO %s (%s-%s)", VERSION, OsName(), OsCPU());
 	    hdrsize += 4 + strlen(temp);
 	    fprintf(ofp, "\1TID:");
 	    kludgewrite(temp, ofp);
diff --git a/mbfido/scan.c b/mbfido/scan.c
index d8091cb4..e06bb666 100644
--- a/mbfido/scan.c
+++ b/mbfido/scan.c
@@ -624,7 +624,7 @@ void ExportEcho(sysconnect L, unsigned long MsgNum, fa_list **sbl)
 		     * At the end of the kludges, add the TID kludge.
 		     */
 		    kludges = FALSE;
-		    fprintf(qp, "\001TID: MBSE-FIDO %s\r", VERSION);
+		    fprintf(qp, "\001TID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
 		}
 		fprintf(qp, "%s", p);
 		if (strncmp(p, " * Origin:", 10) == 0)
@@ -709,7 +709,7 @@ void ExportNews(unsigned long MsgNum, fa_list **sbl)
 						 * After the first kludges, send RFC headers
 						 */
 						kludges = FALSE;
-						fprintf(qp, "\001TID: MBSE-FIDO %s\n", VERSION);
+						fprintf(qp, "\001TID: MBSE-FIDO %s (%s-%s)\n", VERSION, OsName(), OsCPU());
 						fprintf(qp, "Subject: %s\n", Msg.Subject);
 						Syslog('m', "Subject: %s", Msg.Subject);
 						fprintf(qp, "\n");
@@ -1116,7 +1116,7 @@ void ExportEmail(unsigned long MsgNum)
 		if (p[0] == '\001') {
 		    fprintf(qp, "%s\n", p+1);
 		    if (!strncmp(p, "\001PID:", 5)) {
-			fprintf(qp, "TID: MBSE-FIDO %s\n", VERSION);
+			fprintf(qp, "TID: MBSE-FIDO %s (%s-%s)\n", VERSION, OsName(), OsCPU());
 		    }
 		} else {
 		    if (kludges) {
diff --git a/mbfido/sendmail.c b/mbfido/sendmail.c
index 4002be24..849924ab 100644
--- a/mbfido/sendmail.c
+++ b/mbfido/sendmail.c
@@ -119,7 +119,7 @@ FILE *SendMgrMail(faddr *t, int Keep, int FileAttach, char *bymgr, char *subj, c
 	fprintf(qp, "\001MSGID: %s %08lx\r", aka2str(Orig), sequencer());
 	if (reply != NULL)
 		fprintf(qp, "\001REPLY: %s\r", reply);
-	fprintf(qp, "\001PID: MBSE-FIDO %s\r", VERSION);
+	fprintf(qp, "\001PID: MBSE-FIDO %s (%s-%s)\r", VERSION, OsName(), OsCPU());
 	fprintf(qp, "\001TZUTC: %s\r", gmtoffset(Now));
 	return qp;
 }
diff --git a/mbsebbs/msgutil.c b/mbsebbs/msgutil.c
index 1b48699f..428d7e57 100644
--- a/mbsebbs/msgutil.c
+++ b/mbsebbs/msgutil.c
@@ -237,7 +237,7 @@ void Add_Headkludges(faddr *dest, int IsReply)
     } else
 	Msg.ReplyCRC = 0xffffffff;
 
-    sprintf(temp, "\001PID: MBSE-BBS %s", VERSION);
+    sprintf(temp, "\001PID: MBSE-BBS %s (%s-%s)", VERSION, OsName(), OsCPU());
     MsgText_Add2(temp);
     tt = time(NULL);
     sprintf(temp, "\001TZUTC: %s", gmtoffset(tt));