diff --git a/CMakeLists.txt b/CMakeLists.txt
index 173a373e..efca2ba9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,3 +209,20 @@ target_sources(ccls PRIVATE
   src/messages/textDocument_signatureHelp.cc
   src/messages/workspace.cc
 )
+
+### Obtain CCLS version information from Git
+### This only happens when cmake is re-run!
+
+if(NOT CCLS_VERSION)
+  execute_process(COMMAND git describe --tag --long HEAD
+    OUTPUT_VARIABLE CCLS_VERSION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+
+  if(NOT CCLS_VERSION)
+    set(CCLS_VERSION "<unknown>")
+  endif()
+endif()
+
+set_property(SOURCE src/main.cc APPEND PROPERTY
+             COMPILE_DEFINITIONS CCLS_VERSION=\"${CCLS_VERSION}\")
diff --git a/src/main.cc b/src/main.cc
index 6bf11d68..ece5dc6e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -72,7 +72,8 @@ int main(int argc, char **argv) {
   TraceMe();
   sys::PrintStackTraceOnErrorSignal(argv[0]);
   cl::SetVersionPrinter([](raw_ostream &OS) {
-    OS << clang::getClangToolFullVersion("ccls") << "\n";
+    OS << clang::getClangToolFullVersion("ccls version " CCLS_VERSION "\nclang")
+       << "\n";
   });
 
   for (auto &I : TopLevelSubCommand->OptionsMap)