diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp
index 76b7f3856f7c4b18baed671d20bdcb30f0bc5a2f..8737e3046fc9d6ca8fb6ce1cad011794b2eec192 100644
--- a/src/sbbs3/atcodes.cpp
+++ b/src/sbbs3/atcodes.cpp
@@ -238,11 +238,17 @@ const char* sbbs_t::atcode(char* sp, char* str, size_t maxlen)
 		return(str);
 	}
 
+	if(!strcmp(sp,"TIMEZONE"))
+		return(smb_zonestr(sys_timezone(&cfg),str));
+
 	if(!strcmp(sp,"DATE") || !strcmp(sp,"SYSDATE")) {
 		now=time(NULL);
 		return(unixtodstr(&cfg,now,str));
 	}
 
+	if(!strcmp(sp,"DATETIME"))
+		return(timestr(time(NULL)));
+
 	if(!strcmp(sp,"TMSG")) {
 		l=0;
 		for(i=0;i<cfg.total_subs;i++)