-/* these should end up using variants of PROGRAM_NAME */
-#ifdef __APPLE__
-const char* const user_config_dir_name = X_("Ardour" "3");
+char config_dir_name[] = X_(PROGRAM_NAME PROGRAM_VERSION);
+#if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
+const char* const user_config_dir_name = config_dir_name;