diff --git a/doorlockd/CMakeLists.txt b/doorlockd/CMakeLists.txt
index af6d1c1..1f2b881 100644
--- a/doorlockd/CMakeLists.txt
+++ b/doorlockd/CMakeLists.txt
@@ -7,7 +7,7 @@ set(DOORLOCKD_VERSION_MAJOR 1)
 set(DOORLOCKD_VERSION_MINOR 0)
 set(DOORLOCKD_VERSION_PATCH 0)
 
-set(DOORLOCKD_VERSION "${DOORLOCKD_VERSION_MAJOR}.${DOORLOCKD_VERSION_MINOR}.${DOORLOCKD_VERSION_PATCH}")
+set(DOORLOCKD_VERSION "${DOORLOCKD_VERSION_MAJOR}.${DOORLOCKD_VERSION_MINOR}-${DOORLOCKD_VERSION_PATCH}")
 
 MESSAGE(STATUS "doorlockd version: ${DOORLOCKD_VERSION}")
 
diff --git a/doorlockd/config.h.in b/doorlockd/config.h.in
index 06de1b5..0516dff 100644
--- a/doorlockd/config.h.in
+++ b/doorlockd/config.h.in
@@ -6,6 +6,7 @@
 #define DOORLOCKD_VERSION_MAJOR "@DOORLOCKD_VERSION_MAJOR@"
 #define DOORLOCKD_VERSION_MINOR "@DOORLOCKD_VERSION_MINOR@"
 #define DOORLOCKD_VERSION_PATCH "@DOORLOCKD_VERSION_PATCH@"
+#define DOORLOCKD_VERSION       "@DOORLOCKD_VERSION@"
 
 #define DOORLOCKD_GIT_BRANCH      @GIT_BRANCH@
 #define DOORLOCKD_GIT_COMMIT_HASH @GIT_COMMIT_HASH@
diff --git a/doorlockd/main.cpp b/doorlockd/main.cpp
index 9246a54..70b35d3 100644
--- a/doorlockd/main.cpp
+++ b/doorlockd/main.cpp
@@ -20,8 +20,7 @@ using boost::asio::ip::tcp;
 
 // Info about doorlockd version
 const static std::string version =
-        (std::string)"doorlockd-" + DOORLOCKD_VERSION_MAJOR + "."
-        + DOORLOCKD_VERSION_MINOR + "-" + DOORLOCKD_VERSION_PATCH;
+        "doorlockd-" DOORLOCKD_VERSION;
 const static std::string gitversion =
         DOORLOCKD_GIT_BRANCH  "-" DOORLOCKD_GIT_COMMIT_HASH;