-Ustrncat(version_date, today+4, 3);
-Ustrncat(version_date, today, 4);
-Ustrncat(version_date, today+7, 4);
-Ustrcat(version_date, " ");
-Ustrcat(version_date, __TIME__);
+Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, sizeof(date_buffer));
+
+#else
+ {
+ uschar today[20];
+ Ustrcpy(today, US __DATE__);
+ if (today[4] == ' ') today[4] = '0';
+ today[3] = today[6] = '-';
+
+ version_date = date_buffer;
+ version_date[0] = 0;
+ Ustrncat(version_date, today+4, 3);
+ Ustrncat(version_date, today, 4);
+ Ustrncat(version_date, today+7, 4);
+ Ustrcat(version_date, US" ");
+ Ustrcat(version_date, US __TIME__);
+ }
+#endif