diff --git a/src/hmi_msg.h b/src/hmi_msg.h
index eb15a51..f4cd664 100644
--- a/src/hmi_msg.h
+++ b/src/hmi_msg.h
@@ -2,8 +2,8 @@
 #ifndef _HMI_MSG_H_
 #define _HMI_MSG_H_
 
-#define PROG_VERSION "Version: "GIT_DESCR" built on: "__DATE__" "__TIME__"\n"
-#define LIBC_VERSION "avr-libc version: "__AVR_LIBC_VERSION_STRING__"\n"
+#define PROG_VERSION "Version: %S built on: %S %S\n"
+#define LIBC_VERSION "avr-libc version: %S\n"
 #define STUD_NAME "Arti Zirk"
 #define GET_MONTH_MSG "Enter Month name first letter >"
 
diff --git a/src/main.c b/src/main.c
index c18e39e..1f233a1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,8 +23,8 @@ int main (void)
     /* End init */
 
     /* Print version info to stderr */
-    fprintf_P(stderr, PSTR(PROG_VERSION));
-    fprintf_P(stderr, PSTR(LIBC_VERSION));
+    fprintf_P(stderr, PSTR(PROG_VERSION), PSTR(GIT_DESCR), PSTR(__DATE__), PSTR(__TIME__));
+    fprintf_P(stderr, PSTR(LIBC_VERSION), PSTR(__AVR_LIBC_VERSION_STRING__));
     /* End version print */
 
     fprintf_P(stdout, PSTR(STUD_NAME));