diff --git a/3proxy.rc b/3proxy.rc
index 062c625..529ea05 100644
--- a/3proxy.rc
+++ b/3proxy.rc
@@ -1,6 +1,3 @@
-#include "src/version.h"
-
-
 1 VERSIONINFO
 FILEVERSION 0,9,0,0
 PRODUCTVERSION 0,9,0,0
@@ -14,12 +11,12 @@ BEGIN
             VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.ru/\0"
             VALUE "CompanyName", "Vladimir Dubrovin\0"
             VALUE "FileDescription", "3proxy - tiny proxy server\0"
-            VALUE "FileVersion", "0.9-devel-" BUILDDATE "\0"
+            VALUE "FileVersion", "0.9-devel\0"
             VALUE "InternalName", "3proxy\0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2016 Vladimir Dubrovin\0"
+            VALUE "LegalCopyright", "Copyright (C) 2002-2017 Vladimir Dubrovin\0"
             VALUE "OriginalFilename", "3proxy.exe\0"
             VALUE "ProductName", "3proxy\0"
-            VALUE "ProductVersion", "0.9-devel-" BUILDDATE "\0"
+            VALUE "ProductVersion", "0.9-devel\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/proxymain.c b/src/proxymain.c
index 9b9a323..80dd0d4 100644
--- a/src/proxymain.c
+++ b/src/proxymain.c
@@ -449,7 +449,7 @@ int MODULEMAINFUNC (int argc, char** argv){
 		haveerror = 1;
 		conf.threadinit = 0;
 #endif
-		fprintf(stderr, "%s of " VERSION " (" BUILDDATE ")\n"
+		fprintf(stderr, "%s of %s\n"
 			"Usage: %s options\n"
 			"Available options are:\n"
 			"%s"
@@ -459,7 +459,9 @@ int MODULEMAINFUNC (int argc, char** argv){
 			"%s"
 			"\tExample: %s -i127.0.0.1\n\n"
 			"%s", 
-			argv[0], argv[0], loghelp, childdef.helpmessage, argv[0],
+			argv[0], 
+			conf.stringtable?conf.stringtable[3]: VERSION " (" BUILDDATE ")",
+			argv[0], loghelp, childdef.helpmessage, argv[0],
 #ifdef STDMAIN
 			copyright
 #else
@@ -480,7 +482,7 @@ int MODULEMAINFUNC (int argc, char** argv){
 		haveerror = 1;
 		conf.threadinit = 0;
 #endif
-		fprintf(stderr, "%s of " VERSION " (" BUILDDATE ")\n"
+		fprintf(stderr, "%s of %s\n"
 			"Usage: %s options"
 			" [-e<external_ip>] <port_to_bind>"
 			" <target_hostname> <target_port>\n"
@@ -491,7 +493,9 @@ int MODULEMAINFUNC (int argc, char** argv){
 			"%s"
 			"\tExample: %s -d -i127.0.0.1 6666 serv.somehost.ru 6666\n\n"
 			"%s", 
-			argv[0], argv[0], loghelp, childdef.helpmessage, argv[0],
+			argv[0],
+			conf.stringtable?conf.stringtable[3]: VERSION " (" BUILDDATE ")",
+			argv[0], loghelp, childdef.helpmessage, argv[0],
 #ifdef STDMAIN
 			copyright
 #else
diff --git a/src/version.h b/src/version.h
index 48d8190..8c92d86 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,6 @@
+#ifndef VERSION
 #define VERSION "3proxy-0.9-devel"
-#define BUILDDATE "161224021247"
+#endif
+#ifndef BUILDDATE
+#define BUILDDATE __DATE__ ", " __TIME__
+#endif