diff --git a/.gitignore b/.gitignore
index 614df74be6..615fd25a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,7 @@ data/le9q663011
 data/settings.ini
 data/maps.update
 GeneratedFiles
-version/version.h
+version/version.hpp
 
 syntax: regexp
 (.*/)?\#[^/]*\#$
diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp
index dab8f7eb46..a7aadb35be 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/indexer/indexer_tool/indexer_tool.cpp
@@ -22,7 +22,7 @@
 #include "../../std/iomanip.hpp"
 #include "../../std/numeric.hpp"
 
-//#include "../../version/version.h"
+#include "../../version/version.hpp"
 
 #include "../../base/start_mem_debug.hpp"
 
@@ -70,11 +70,11 @@ int main(int argc, char ** argv)
   string const path =
       FLAGS_data_path.empty() ? GetPlatform().WorkingDir() : AddSlashIfNeeded(FLAGS_data_path);
 
-  //if (FLAGS_version)
-  //{
-  //  cout << "Tool version: " << VERSION_STRING << endl;
-  //  cout << "Built on: " << VERSION_DATE_STRING << endl;
-  //}
+  if (FLAGS_version)
+  {
+    cout << "Tool version: " << VERSION_STRING << endl;
+    cout << "Built on: " << VERSION_DATE_STRING << endl;
+  }
 
   // Make a classificator
   if (FLAGS_generate_classif)
diff --git a/qt/main.cpp b/qt/main.cpp
index 588d0c09a0..ec7d40c458 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -4,7 +4,7 @@
 
 #include "../base/logging.hpp"
 
-//#include "../version/version.h"
+#include "../version/version.hpp"
 
 #include <QtGui/QApplication>
 
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
   InitializeFinalize mainGuard;
 
   LOG(LINFO, ("MapsWithMe started"));
-  //LOG(LINFO, ("Version : ", VERSION_STRING));
-  //LOG(LINFO, ("Built on : ", VERSION_DATE_STRING));
+  LOG(LINFO, ("Version : ", VERSION_STRING));
+  LOG(LINFO, ("Built on : ", VERSION_DATE_STRING));
 
   QApplication a(argc, argv);
 
diff --git a/version/empty_stub.cpp b/version/empty_stub.cpp
index 15d67d026e..9c100003dd 100644
--- a/version/empty_stub.cpp
+++ b/version/empty_stub.cpp
@@ -1 +1 @@
-#include "version.h"
+#include "version.hpp"
diff --git a/version/version.pro b/version/version.pro
index 935aca0eb9..b61f3ee90c 100644
--- a/version/version.pro
+++ b/version/version.pro
@@ -9,7 +9,7 @@ ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
 
 # Generate version header
-VERSION_HEADER = $${IN_PWD}/../version/version.h
+VERSION_HEADER = $${IN_PWD}/../version/version.hpp
 
 versiontarget.target = $$VERSION_HEADER
 win32 {