diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index a1a7d88a..a6e4b250 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -133,15 +133,15 @@ void _glfwPlatformTerminate(void)
 
 const char* _glfwPlatformGetVersionString(void)
 {
-    const char* version = _GLFW_VERSION_FULL
-#if defined(_GLFW_BUILD_DLL)
-        " dynamic"
-#endif
+    const char* version = _GLFW_VERSION_FULL " Cocoa"
 #if defined(_GLFW_USE_CHDIR)
         " chdir"
 #endif
 #if defined(_GLFW_USE_MENUBAR)
         " menubar"
+#endif
+#if defined(_GLFW_BUILD_DLL)
+        " dynamic"
 #endif
         ;
 
diff --git a/src/win32_init.c b/src/win32_init.c
index 31fee9d5..225f6782 100644
--- a/src/win32_init.c
+++ b/src/win32_init.c
@@ -200,7 +200,7 @@ void _glfwPlatformTerminate(void)
 
 const char* _glfwPlatformGetVersionString(void)
 {
-    const char* version = _GLFW_VERSION_FULL
+    const char* version = _GLFW_VERSION_FULL " Win32"
 #if defined(_GLFW_WGL)
         " WGL"
 #elif defined(_GLFW_EGL)
@@ -209,17 +209,15 @@ const char* _glfwPlatformGetVersionString(void)
 #if defined(__MINGW32__)
         " MinGW"
 #elif defined(_MSC_VER)
-        " Visual C++ "
+        " VisualC "
 #elif defined(__BORLANDC__)
-        " Borland C"
-#else
-        " (unknown compiler)"
+        " BorlandC"
+#endif
+#if !defined(_GLFW_NO_DLOAD_WINMM)
+        " LoadLibrary(winmm)"
 #endif
 #if defined(_GLFW_BUILD_DLL)
         " DLL"
-#endif
-#if !defined(_GLFW_NO_DLOAD_WINMM)
-        " load(winmm)"
 #endif
         ;
 
diff --git a/src/x11_init.c b/src/x11_init.c
index 763a1363..73bd7ff1 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -615,7 +615,7 @@ void _glfwPlatformTerminate(void)
 
 const char* _glfwPlatformGetVersionString(void)
 {
-    const char* version = _GLFW_VERSION_FULL
+    const char* version = _GLFW_VERSION_FULL " X11"
 #if defined(_GLFW_GLX)
         " GLX"
 #elif defined(_GLFW_EGL)
@@ -634,9 +634,7 @@ const char* _glfwPlatformGetVersionString(void)
         " clock_gettime"
 #endif
 #if defined(__linux__)
-        " Linux-joystick-API"
-#else
-        " no-joystick-support"
+        " /dev/js"
 #endif
 #if defined(_GLFW_BUILD_DLL)
         " shared"