diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt
index f4372528fc09..d9b4fea657f1 100644
--- a/lldb/tools/debugserver/source/CMakeLists.txt
+++ b/lldb/tools/debugserver/source/CMakeLists.txt
@@ -11,8 +11,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 add_definitions(
-  -DDEBUGSERVER_VERSION_NUM=${LLDB_VERSION}
-  -DDEBUGSERVER_VERSION_STR=${LLDB_VERSION}
+  -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}"
   )
 
 add_library(lldbDebugserverCommon
diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp
index 2f38e49d5b42..2d8b36688e45 100644
--- a/lldb/tools/debugserver/source/RNBRemote.cpp
+++ b/lldb/tools/debugserver/source/RNBRemote.cpp
@@ -3805,7 +3805,7 @@ RNBRemote::HandlePacket_qGDBServerVersion (const char *p)
         strm << "name:" DEBUGSERVER_PROGRAM_NAME ";";
     else
         strm << "name:debugserver;";
-    strm << "version:" << DEBUGSERVER_VERSION_NUM << ";";
+    strm << "version:" << DEBUGSERVER_VERSION_STR << ";";
 
     return SendPacket (strm.str());
 }
diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index 9fdcceb74493..c9a6ebb37da1 100644
--- a/lldb/tools/debugserver/source/debugserver.cpp
+++ b/lldb/tools/debugserver/source/debugserver.cpp
@@ -781,7 +781,7 @@ ASLLogCallback(void *baton, uint32_t flags, const char *format, va_list args)
     {
         g_aslmsg = ::asl_new (ASL_TYPE_MSG);
         char asl_key_sender[PATH_MAX];
-        snprintf(asl_key_sender, sizeof(asl_key_sender), "com.apple.%s-%g", DEBUGSERVER_PROGRAM_NAME, DEBUGSERVER_VERSION_NUM);
+        snprintf(asl_key_sender, sizeof(asl_key_sender), "com.apple.%s-%s", DEBUGSERVER_PROGRAM_NAME, DEBUGSERVER_VERSION_STR);
         ::asl_set (g_aslmsg, ASL_KEY_SENDER, asl_key_sender);
     }
 
@@ -1234,9 +1234,9 @@ main (int argc, char *argv[])
     // as long as we're dropping remotenub in as a replacement for gdbserver,
     // explicitly note that this is not gdbserver.
 
-    RNBLogSTDOUT ("%s-%g %sfor %s.\n",
+    RNBLogSTDOUT ("%s-%s %sfor %s.\n",
                   DEBUGSERVER_PROGRAM_NAME,
-                  DEBUGSERVER_VERSION_NUM,
+                  DEBUGSERVER_VERSION_STR,
                   compile_options.c_str(),
                   RNB_ARCH);