diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h
index eb06d5158a852e7ffc9b139c65ddd307bc1ec607..86570c0a356d8d4d81a2894883546359571dabb1 100644
--- a/src/smblib/smbdefs.h
+++ b/src/smblib/smbdefs.h
@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2011 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This program is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU General Public License				*
@@ -192,6 +192,11 @@
 #define SENDERPORT_BIN		0x0a		/* deprecated */
 #define SENDERPORT			0x0b		/* for tracing */
 
+										/* Used for the SMTP Originator-Info header field: */
+#define SENDERUSERID		0x0c		/* user-id */
+#define SENDERTIME			0x0d		/* authentication/connection time */
+#define SENDERSERVER		0x0e		/* server hostname that authenticed user */
+
 #define AUTHOR				0x10
 #define AUTHORAGENT 		0x11
 #define AUTHORNETTYPE		0x12
diff --git a/src/smblib/smbstr.c b/src/smblib/smbstr.c
index 84a5e1aa63906074fe592c6782e9a1fcb81be483..0929e2bbcd38775a292c068c83f41250d33a90e9 100644
--- a/src/smblib/smbstr.c
+++ b/src/smblib/smbstr.c
@@ -8,7 +8,7 @@
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2011 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This library is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU Lesser General Public License		*
@@ -56,6 +56,9 @@ char* SMBCALL smb_hfieldtype(ushort type)
 		case SENDERPROTOCOL:	return("SenderProtocol");
 		case SENDERPORT_BIN:	return("SenderPortBin");
 		case SENDERPORT:		return("SenderPort");
+		case SENDERUSERID:		return("SenderUserID");
+		case SENDERTIME:		return("SenderTime");
+		case SENDERSERVER:		return("SenderServer");
 
 		case REPLYTO:			return("Reply-To");				/* RFC-compliant */
 		case REPLYTOAGENT:		return("Reply-ToAgent");