diff --git a/CMakeLists.txt b/CMakeLists.txt
index f889d1e..e8781c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,10 @@
 ]]
 cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
 
-# Get the user agent and use it as a version
-# This gets the string with the user agent from the header.
+# Get the CPPHTTPLIB_VERSION value and use it as a version
+# This gets the string with the CPPHTTPLIB_VERSION value from the header.
 # This is so the maintainer doesn't actually need to update this manually.
-file(STRINGS httplib.h _raw_version_string REGEX "User\-Agent.*cpp\-httplib/([0-9]+\.?)+")
+file(STRINGS httplib.h _raw_version_string REGEX "CPPHTTPLIB_VERSION \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
 
 # Needed since git tags have "v" prefixing them.
 # Also used if the fallback to user agent string is being used.
diff --git a/httplib.h b/httplib.h
index f3c1c77..5472c08 100644
--- a/httplib.h
+++ b/httplib.h
@@ -8,9 +8,7 @@
 #ifndef CPPHTTPLIB_HTTPLIB_H
 #define CPPHTTPLIB_HTTPLIB_H
 
-#define CPPHTTPLIB_VERSION_MAJOR 0
-#define CPPHTTPLIB_VERSION_MINOR 10
-#define CPPHTTPLIB_VERSION_PATCH 5
+#define CPPHTTPLIB_VERSION "0.10.5"
 
 /*
  * Configuration
@@ -6198,9 +6196,7 @@ inline bool ClientImpl::write_request(Stream &strm, Request &req,
 
 #ifndef CPPHTTPLIB_NO_DEFAULT_USER_AGENT
   if (!req.has_header("User-Agent")) {
-    auto agent = "cpp-httplib/" + std::to_string(CPPHTTPLIB_VERSION_MAJOR) +
-                 "." + std::to_string(CPPHTTPLIB_VERSION_MINOR) + "." +
-                 std::to_string(CPPHTTPLIB_VERSION_PATCH);
+    auto agent = std::string("cpp-httplib/") + CPPHTTPLIB_VERSION;
     req.headers.emplace("User-Agent", agent);
   }
 #endif